Przeglądaj źródła

grid viewer : minor modifications

olinox 9 lat temu
rodzic
commit
72121885ff
2 zmienionych plików z 20 dodań i 46 usunięć
  1. 7 16
      tests/gridviewer/main.py
  2. 13 30
      tests/gridviewer/main.ui

+ 7 - 16
tests/gridviewer/main.py

@@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_window(object):
     def setupUi(self, window):
         window.setObjectName("window")
-        window.resize(910, 669)
+        window.resize(910, 658)
         font = QtGui.QFont()
         font.setFamily("Verdana")
         font.setPointSize(8)
@@ -105,12 +105,8 @@ class Ui_window(object):
         self.verticalLayout_2.setContentsMargins(0, -1, -1, -1)
         self.verticalLayout_2.setSpacing(2)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.txt_coords = QtWidgets.QTextEdit(self.centralwidget)
-        self.txt_coords.setMinimumSize(QtCore.QSize(183, 0))
-        self.txt_coords.setObjectName("txt_coords")
-        self.verticalLayout_2.addWidget(self.txt_coords)
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_3.setContentsMargins(-1, 10, -1, -1)
+        self.horizontalLayout_3.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
         spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout_3.addItem(spacerItem1)
@@ -125,29 +121,25 @@ class Ui_window(object):
         self.btn_toClipboard.setObjectName("btn_toClipboard")
         self.horizontalLayout_3.addWidget(self.btn_toClipboard)
         self.verticalLayout_2.addLayout(self.horizontalLayout_3)
+        self.txt_coords = QtWidgets.QTextEdit(self.centralwidget)
+        self.txt_coords.setMinimumSize(QtCore.QSize(183, 0))
+        self.txt_coords.setObjectName("txt_coords")
+        self.verticalLayout_2.addWidget(self.txt_coords)
         self.horizontalLayout.addLayout(self.verticalLayout_2)
         self.horizontalLayout.setStretch(0, 2)
         window.setCentralWidget(self.centralwidget)
-        self.menubar = QtWidgets.QMenuBar(window)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 910, 21))
-        self.menubar.setObjectName("menubar")
-        self.menuFichier = QtWidgets.QMenu(self.menubar)
-        self.menuFichier.setObjectName("menuFichier")
-        window.setMenuBar(self.menubar)
         self.statusbar = QtWidgets.QStatusBar(window)
         self.statusbar.setObjectName("statusbar")
         window.setStatusBar(self.statusbar)
         self.actionQuitter = QtWidgets.QAction(window)
         self.actionQuitter.setObjectName("actionQuitter")
-        self.menuFichier.addAction(self.actionQuitter)
-        self.menubar.addAction(self.menuFichier.menuAction())
 
         self.retranslateUi(window)
         QtCore.QMetaObject.connectSlotsByName(window)
 
     def retranslateUi(self, window):
         _translate = QtCore.QCoreApplication.translate
-        window.setWindowTitle(_translate("window", "MainWindow"))
+        window.setWindowTitle(_translate("window", "GridViewer"))
         self.lbl_title.setText(_translate("window", "Grid Viewer"))
         self.label.setText(_translate("window", "Update Grid"))
         self.opt_hex.setText(_translate("window", "Hexagonal grid"))
@@ -160,6 +152,5 @@ class Ui_window(object):
         self.chk_displayCoords.setText(_translate("window", "Display coordinates"))
         self.btn_updateSelection.setText(_translate("window", "Update selection"))
         self.btn_toClipboard.setText(_translate("window", "To clipboard"))
-        self.menuFichier.setTitle(_translate("window", "Fichier"))
         self.actionQuitter.setText(_translate("window", "Quitter"))
 

+ 13 - 30
tests/gridviewer/main.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>910</width>
-    <height>669</height>
+    <height>658</height>
    </rect>
   </property>
   <property name="font">
@@ -17,7 +17,7 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>GridViewer</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout" stretch="2,0">
@@ -270,20 +270,10 @@
       <property name="leftMargin">
        <number>0</number>
       </property>
-      <item>
-       <widget class="QTextEdit" name="txt_coords">
-        <property name="minimumSize">
-         <size>
-          <width>183</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <property name="topMargin">
-         <number>10</number>
+         <number>0</number>
         </property>
         <item>
          <spacer name="horizontalSpacer">
@@ -338,27 +328,20 @@
         </item>
        </layout>
       </item>
+      <item>
+       <widget class="QTextEdit" name="txt_coords">
+        <property name="minimumSize">
+         <size>
+          <width>183</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
      </layout>
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>910</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFichier">
-    <property name="title">
-     <string>Fichier</string>
-    </property>
-    <addaction name="actionQuitter"/>
-   </widget>
-   <addaction name="menuFichier"/>
-  </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="actionQuitter">
    <property name="text">