WebSVN - OpenInventory - Различия - Редакция 141 и 144


<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
 <class>MainWindow</class>
 <widget class="QMainWindow" name="MainWindow">
  <property name="geometry">
   <rect>
    <x>0</x>
    <y>0</y>
    <width>1098</width>
    <height>697</height>
   </rect>
  </property>
  <property name="windowTitle">
   <string>MainWindow</string>
  </property>
  <widget class="QWidget" name="centralWidget">
   <widget class="QTabWidget" name="tabWidget">
    <property name="geometry">
     <rect>
      <x>20</x>
      <y>10</y>
      <width>521</width>
      <height>591</height>
     </rect>
    </property>
    <property name="currentIndex">
     <number>0</number>
    </property>
    <widget class="QWidget" name="tab">
     <attribute name="title">
      <string>Tab 1</string>
     </attribute>
     <widget class="QTreeWidget" name="treeWidget_2">
      <property name="geometry">
       <rect>
        <x>10</x>
        <y>10</y>
        <width>491</width>
        <height>451</height>
       </rect>
      </property>
      <column>
       <property name="text">
        <string notr="true">1</string>
       </property>
      </column>
      <column>
       <property name="text">
        <string>Тип узла</string>
       </property>
      </column>
      <column>
       <property name="text">
        <string>ID</string>
       </property>
      </column>
      <column>
       <property name="text">
        <string>Хранилище</string>
       </property>
      </column>
      <column>
       <property name="text">
        <string>Поле-указатель</string>
       </property>
      </column>
     </widget>
    </widget>
    <widget class="QWidget" name="tab_2">
     <attribute name="title">
      <string>Tab 2</string>
     </attribute>
     <widget class="QTreeWidget" name="treeWidget">
      <property name="geometry">
       <rect>
        <x>10</x>
        <y>10</y>
        <width>711</width>
        <height>451</height>
       </rect>
      </property>
      <column>
       <property name="text">
        <string notr="true">Имя класа</string>
       </property>
      </column>
      <column>
       <property name="text">
        <string>ID класса</string>
       </property>
      </column>
      <column>
       <property name="text">
        <string>Номер строки в файле</string>
       </property>
      </column>
      <column>
       <property name="text">
        <string>Уровень вложения</string>
       </property>
      </column>
     </widget>
     <widget class="QComboBox" name="comboBox">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="geometry">
       <rect>
        <x>10</x>
        <y>480</y>
        <width>381</width>
        <height>31</height>
       </rect>
      </property>
      <property name="editable">
       <bool>false</bool>
      </property>
     </widget>
     <widget class="QLabel" name="label">
      <property name="geometry">
       <rect>
        <x>420</x>
        <y>480</y>
        <width>78</width>
        <height>21</height>
       </rect>
      </property>
      <property name="text">
       <string>ID</string>
      </property>
     </widget>
    </widget>
   </widget>
   <widget class="QTabWidget" name="tabWidget_2">
    <property name="geometry">
     <rect>
      <x>580</x>
      <y>10</y>
      <width>501</width>
      <height>591</height>
     </rect>
    </property>
    <property name="currentIndex">
     <number>0</number>
    </property>
    <widget class="QWidget" name="tab_3">
     <attribute name="title">
      <string>Tab 1</string>
     </attribute>
     <widget class="QTableView" name="tableView">
      <property name="geometry">
       <rect>
        <x>10</x>
        <y>10</y>
        <width>471</width>
        <height>451</height>
       </rect>
      </property>
     </widget>
     <widget class="QPushButton" name="pushButton">
      <property name="geometry">
       <rect>
        <x>10</x>
        <y>470</y>
        <width>251</width>
        <height>30</height>
       </rect>
      </property>
      <property name="text">
       <string>Добавить новый объект</string>
      </property>
     </widget>
     <widget class="QPushButton" name="pushButton_2">
      <property name="geometry">
       <rect>
        <x>269</x>
        <y>470</y>
        <width>211</width>
        <height>30</height>
       </rect>
      </property>
      <property name="text">
       <string>Удалить объект</string>
      </property>
     </widget>
     <widget class="QPushButton" name="pushButton_3">
      <property name="geometry">
       <rect>
        <x>10</x>
        <y>510</y>
        <width>151</width>
        <height>30</height>
       </rect>
      </property>
      <property name="text">
       <string>Применить</string>
      </property>
     </widget>
     <widget class="QPushButton" name="pushButton_4">
      <property name="geometry">
       <rect>
        <x>269</x>
        <y>510</y>
        <width>211</width>
        <height>30</height>
       </rect>
      </property>
      <property name="text">
       <string>Сбросить изменения</string>
      </property>
     </widget>
    </widget>
    <widget class="QWidget" name="tab_4">
     <attribute name="title">
      <string>Tab 2</string>
     </attribute>
     <widget class="QTableView" name="tableView_2">
      <property name="geometry">
       <rect>
        <x>10</x>
        <y>10</y>
        <width>471</width>
        <height>351</height>
       </rect>
      </property>
     </widget>
     <widget class="QPushButton" name="pushButton_5">
      <property name="geometry">
       <rect>
        <x>20</x>
        <y>380</y>
        <width>191</width>
        <height>30</height>
       </rect>
      </property>
      <property name="text">
       <string>Добавить модель</string>
      </property>
     </widget>
     <widget class="QPushButton" name="pushButton_6">
      <property name="geometry">
       <rect>
        <x>259</x>
        <y>380</y>
        <width>221</width>
        <height>30</height>
       </rect>
      </property>
      <property name="text">
       <string>Удалить модель</string>
      </property>
     </widget>
     <widget class="QPushButton" name="pushButton_7">
      <property name="geometry">
       <rect>
        <x>20</x>
        <y>430</y>
        <width>130</width>
        <height>30</height>
       </rect>
      </property>
      <property name="text">
       <string>Применить</string>
      </property>
     </widget>
     <widget class="QPushButton" name="pushButton_8">
      <property name="geometry">
       <rect>
        <x>269</x>
        <y>430</y>
        <width>211</width>
        <height>30</height>
       </rect>
      </property>
      <property name="text">
       <string>Сбросить изменения</string>
      </property>
     </widget>
    </widget>
   </widget>
  </widget>
  <widget class="QMenuBar" name="menuBar">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>1098</width>
     <height>27</height>
    </rect>
   </property>
   <widget class="QMenu" name="menu">
    <property name="title">
     <string>База данных</string>
    </property>
    <addaction name="getsettingAct"/>
   </widget>
   <addaction name="menu"/>
  </widget>
  <widget class="QToolBar" name="mainToolBar">
   <attribute name="toolBarArea">
    <enum>TopToolBarArea</enum>
   </attribute>
   <attribute name="toolBarBreak">
    <bool>false</bool>
   </attribute>
  </widget>
  <widget class="QStatusBar" name="statusBar"/>
  <action name="getsettingAct">
   <property name="text">
    <string>Параметры соединения</string>
   </property>
  </action>
 </widget>
 <layoutdefault spacing="6" margin="11"/>
 <resources/>
 <connections/>
</ui>

Редакция 141	Редакция 144
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<ui version="4.0">	2	<ui version="4.0">
3	<class>MainWindow</class>	3	<class>MainWindow</class>
4	<widget class="QMainWindow" name="MainWindow">	4	<widget class="QMainWindow" name="MainWindow">
5	<property name="geometry">	5	<property name="geometry">
6	<rect>	6	<rect>
7	<x>0</x>	7	<x>0</x>
8	<y>0</y>	8	<y>0</y>
9	<width>1098</width>	9	<width>1098</width>
10	<height>697</height>	10	<height>697</height>
11	</rect>	11	</rect>
12	</property>	12	</property>
13	<property name="windowTitle">	13	<property name="windowTitle">
14	<string>MainWindow</string>	14	<string>MainWindow</string>
15	</property>	15	</property>
16	<widget class="QWidget" name="centralWidget">	16	<widget class="QWidget" name="centralWidget">
17	<widget class="QTabWidget" name="tabWidget">	17	<widget class="QTabWidget" name="tabWidget">
18	<property name="geometry">	18	<property name="geometry">
19	<rect>	19	<rect>
20	<x>20</x>	20	<x>20</x>
21	<y>10</y>	21	<y>10</y>
22	<width>521</width>	22	<width>521</width>
23	<height>591</height>	23	<height>591</height>
24	</rect>	24	</rect>
25	</property>	25	</property>
26	<property name="currentIndex">	26	<property name="currentIndex">
27	<number>0</number>	27	<number>0</number>
28	</property>	28	</property>
29	<widget class="QWidget" name="tab">	29	<widget class="QWidget" name="tab">
30	<attribute name="title">	30	<attribute name="title">
31	<string>Tab 1</string>	31	<string>Tab 1</string>
32	</attribute>	32	</attribute>
33	<widget class="QTreeWidget" name="treeWidget_2">	33	<widget class="QTreeWidget" name="treeWidget_2">
34	<property name="geometry">	34	<property name="geometry">
35	<rect>	35	<rect>
36	<x>10</x>	36	<x>10</x>
37	<y>10</y>	37	<y>10</y>
38	<width>491</width>	38	<width>491</width>
39	<height>451</height>	39	<height>451</height>
40	</rect>	40	</rect>
41	</property>	41	</property>
42	<column>	42	<column>
43	<property name="text">	43	<property name="text">
44	<string notr="true">1</string>	44	<string notr="true">1</string>
45	</property>	45	</property>
46	</column>	46	</column>
47	<column>	47	<column>
48	<property name="text">	48	<property name="text">
49	<string>Тип узла</string>	49	<string>Тип узла</string>
50	</property>	50	</property>
51	</column>	51	</column>
52	<column>	52	<column>
53	<property name="text">	53	<property name="text">
54	<string>ID</string>	54	<string>ID</string>
55	</property>	55	</property>
56	</column>	56	</column>
57	<column>	57	<column>
58	<property name="text">	58	<property name="text">
59	<string>Хранилище</string>	59	<string>Хранилище</string>
60	</property>	60	</property>
61	</column>	61	</column>
62	<column>	62	<column>
63	<property name="text">	63	<property name="text">
64	<string>Поле-указатель</string>	64	<string>Поле-указатель</string>
65	</property>	65	</property>
66	</column>	66	</column>
67	</widget>	67	</widget>
68	</widget>	68	</widget>
69	<widget class="QWidget" name="tab_2">	69	<widget class="QWidget" name="tab_2">
70	<attribute name="title">	70	<attribute name="title">
71	<string>Tab 2</string>	71	<string>Tab 2</string>
72	</attribute>	72	</attribute>
73	<widget class="QTreeWidget" name="treeWidget">	73	<widget class="QTreeWidget" name="treeWidget">
74	<property name="geometry">	74	<property name="geometry">
75	<rect>	75	<rect>
76	<x>10</x>	76	<x>10</x>
77	<y>10</y>	77	<y>10</y>
78	<width>711</width>	78	<width>711</width>
79	<height>451</height>	79	<height>451</height>
80	</rect>	80	</rect>
81	</property>	81	</property>
82	<column>	82	<column>
83	<property name="text">	83	<property name="text">
84	<string notr="true">Имя класа</string>	84	<string notr="true">Имя класа</string>
85	</property>	85	</property>
86	</column>	86	</column>
87	<column>	87	<column>
88	<property name="text">	88	<property name="text">
89	<string>ID класса</string>	89	<string>ID класса</string>
90	</property>	90	</property>
91	</column>	91	</column>
92	<column>	92	<column>
93	<property name="text">	93	<property name="text">
94	<string>Номер строки в файле</string>	94	<string>Номер строки в файле</string>
95	</property>	95	</property>
96	</column>	96	</column>
97	<column>	97	<column>
98	<property name="text">	98	<property name="text">
99	<string>Уровень вложения</string>	99	<string>Уровень вложения</string>
100	</property>	100	</property>
101	</column>	101	</column>
102	</widget>	102	</widget>
103	<widget class="QComboBox" name="comboBox">	103	<widget class="QComboBox" name="comboBox">
104	<property name="enabled">	104	<property name="enabled">
105	<bool>false</bool>	105	<bool>false</bool>
106	</property>	106	</property>
107	<property name="geometry">	107	<property name="geometry">
108	<rect>	108	<rect>
109	<x>10</x>	109	<x>10</x>
110	<y>480</y>	110	<y>480</y>
111	<width>381</width>	111	<width>381</width>
112	<height>31</height>	112	<height>31</height>
113	</rect>	113	</rect>
114	</property>	114	</property>
115	<property name="editable">	115	<property name="editable">
116	<bool>false</bool>	116	<bool>false</bool>
117	</property>	117	</property>
118	</widget>	118	</widget>
119	<widget class="QLabel" name="label">	119	<widget class="QLabel" name="label">
120	<property name="geometry">	120	<property name="geometry">
121	<rect>	121	<rect>
122	<x>420</x>	122	<x>420</x>
123	<y>480</y>	123	<y>480</y>
124	<width>78</width>	124	<width>78</width>
125	<height>21</height>	125	<height>21</height>
126	</rect>	126	</rect>
127	</property>	127	</property>
128	<property name="text">	128	<property name="text">
129	<string>ID</string>	129	<string>ID</string>
130	</property>	130	</property>
131	</widget>	131	</widget>
132	</widget>	132	</widget>
133	</widget>	133	</widget>
134	<widget class="QTabWidget" name="tabWidget_2">	134	<widget class="QTabWidget" name="tabWidget_2">
135	<property name="geometry">	135	<property name="geometry">
136	<rect>	136	<rect>
137	<x>580</x>	137	<x>580</x>
138	<y>10</y>	138	<y>10</y>
139	<width>501</width>	139	<width>501</width>
140	<height>591</height>	140	<height>591</height>
141	</rect>	141	</rect>
142	</property>	142	</property>
143	<property name="currentIndex">	143	<property name="currentIndex">
144	<number>0</number>	144	<number>0</number>
145	</property>	145	</property>
146	<widget class="QWidget" name="tab_3">	146	<widget class="QWidget" name="tab_3">
147	<attribute name="title">	147	<attribute name="title">
148	<string>Tab 1</string>	148	<string>Tab 1</string>
149	</attribute>	149	</attribute>
150	<widget class="QTableView" name="tableView">	150	<widget class="QTableView" name="tableView">
151	<property name="geometry">	151	<property name="geometry">
152	<rect>	152	<rect>
153	<x>10</x>	153	<x>10</x>
154	<y>10</y>	154	<y>10</y>
155	<width>471</width>	155	<width>471</width>
156	<height>451</height>	156	<height>451</height>
157	</rect>	157	</rect>
158	</property>	158	</property>
159	</widget>	159	</widget>
160	<widget class="QPushButton" name="pushButton">	160	<widget class="QPushButton" name="pushButton">
161	<property name="geometry">	161	<property name="geometry">
162	<rect>	162	<rect>
163	<x>10</x>	163	<x>10</x>
164	<y>470</y>	164	<y>470</y>
165	<width>251</width>	165	<width>251</width>
166	<height>30</height>	166	<height>30</height>
167	</rect>	167	</rect>
168	</property>	168	</property>
169	<property name="text">	169	<property name="text">
170	<string>Добавить новый объект</string>	170	<string>Добавить новый объект</string>
171	</property>	171	</property>
172	</widget>	172	</widget>
173	<widget class="QPushButton" name="pushButton_2">	173	<widget class="QPushButton" name="pushButton_2">
174	<property name="geometry">	174	<property name="geometry">
175	<rect>	175	<rect>
176	<x>269</x>	176	<x>269</x>
177	<y>470</y>	177	<y>470</y>
178	<width>211</width>	178	<width>211</width>
179	<height>30</height>	179	<height>30</height>
180	</rect>	180	</rect>
181	</property>	181	</property>
182	<property name="text">	182	<property name="text">
183	<string>Удалить объект</string>	183	<string>Удалить объект</string>
184	</property>	184	</property>
185	</widget>	185	</widget>
186	<widget class="QPushButton" name="pushButton_3">	186	<widget class="QPushButton" name="pushButton_3">
187	<property name="geometry">	187	<property name="geometry">
188	<rect>	188	<rect>
189	<x>10</x>	189	<x>10</x>
190	<y>510</y>	190	<y>510</y>
191	<width>151</width>	191	<width>151</width>
192	<height>30</height>	192	<height>30</height>
193	</rect>	193	</rect>
194	</property>	194	</property>
195	<property name="text">	195	<property name="text">
196	<string>Применить</string>	196	<string>Применить</string>
197	</property>	197	</property>
198	</widget>	198	</widget>
199	<widget class="QPushButton" name="pushButton_4">	199	<widget class="QPushButton" name="pushButton_4">
200	<property name="geometry">	200	<property name="geometry">
201	<rect>	201	<rect>
202	<x>269</x>	202	<x>269</x>
203	<y>510</y>	203	<y>510</y>
204	<width>211</width>	204	<width>211</width>
205	<height>30</height>	205	<height>30</height>
206	</rect>	206	</rect>
207	</property>	207	</property>
208	<property name="text">	208	<property name="text">
209	<string>Сбросить изменения</string>	209	<string>Сбросить изменения</string>
210	</property>	210	</property>
211	</widget>	211	</widget>
212	</widget>	212	</widget>
213	<widget class="QWidget" name="tab_4">	213	<widget class="QWidget" name="tab_4">
214	<attribute name="title">	214	<attribute name="title">
215	<string>Tab 2</string>	215	<string>Tab 2</string>
216	</attribute>	216	</attribute>
217	<widget class="QTableView" name="tableView_2">	217	<widget class="QTableView" name="tableView_2">
218	<property name="geometry">	218	<property name="geometry">
219	<rect>	219	<rect>
220	<x>10</x>	220	<x>10</x>
221	<y>10</y>	221	<y>10</y>
222	<width>471</width>	222	<width>471</width>
223	<height>351</height>	223	<height>351</height>
224	</rect>	224	</rect>
225	</property>	225	</property>
226	</widget>	226	</widget>
-		227	<widget class="QPushButton" name="pushButton_5">
-		228	<property name="geometry">
-		229	<rect>
-		230	<x>20</x>
-		231	<y>380</y>
-		232	<width>191</width>
-		233	<height>30</height>
-		234	</rect>
-		235	</property>
-		236	<property name="text">
-		237	<string>Добавить модель</string>
-		238	</property>
-		239	</widget>
-		240	<widget class="QPushButton" name="pushButton_6">
-		241	<property name="geometry">
-		242	<rect>
-		243	<x>259</x>
-		244	<y>380</y>
-		245	<width>221</width>
-		246	<height>30</height>
-		247	</rect>
-		248	</property>
-		249	<property name="text">
-		250	<string>Удалить модель</string>
-		251	</property>
-		252	</widget>
-		253	<widget class="QPushButton" name="pushButton_7">
-		254	<property name="geometry">
-		255	<rect>
-		256	<x>20</x>
-		257	<y>430</y>
-		258	<width>130</width>
-		259	<height>30</height>
-		260	</rect>
-		261	</property>
-		262	<property name="text">
-		263	<string>Применить</string>
-		264	</property>
-		265	</widget>
-		266	<widget class="QPushButton" name="pushButton_8">
-		267	<property name="geometry">
-		268	<rect>
-		269	<x>269</x>
-		270	<y>430</y>
-		271	<width>211</width>
-		272	<height>30</height>
-		273	</rect>
-		274	</property>
-		275	<property name="text">
-		276	<string>Сбросить изменения</string>
-		277	</property>
-		278	</widget>
227	</widget>	279	</widget>
228	</widget>	280	</widget>
229	</widget>	281	</widget>
230	<widget class="QMenuBar" name="menuBar">	282	<widget class="QMenuBar" name="menuBar">
231	<property name="geometry">	283	<property name="geometry">
232	<rect>	284	<rect>
233	<x>0</x>	285	<x>0</x>
234	<y>0</y>	286	<y>0</y>
235	<width>1098</width>	287	<width>1098</width>
236	<height>25</height>	288	<height>27</height>
237	</rect>	289	</rect>
238	</property>	290	</property>
239	<widget class="QMenu" name="menu">	291	<widget class="QMenu" name="menu">
240	<property name="title">	292	<property name="title">
241	<string>База данных</string>	293	<string>База данных</string>
242	</property>	294	</property>
243	<addaction name="getsettingAct"/>	295	<addaction name="getsettingAct"/>
244	</widget>	296	</widget>
245	<addaction name="menu"/>	297	<addaction name="menu"/>
246	</widget>	298	</widget>
247	<widget class="QToolBar" name="mainToolBar">	299	<widget class="QToolBar" name="mainToolBar">
248	<attribute name="toolBarArea">	300	<attribute name="toolBarArea">
249	<enum>TopToolBarArea</enum>	301	<enum>TopToolBarArea</enum>
250	</attribute>	302	</attribute>
251	<attribute name="toolBarBreak">	303	<attribute name="toolBarBreak">
252	<bool>false</bool>	304	<bool>false</bool>
253	</attribute>	305	</attribute>
254	</widget>	306	</widget>
255	<widget class="QStatusBar" name="statusBar"/>	307	<widget class="QStatusBar" name="statusBar"/>
256	<action name="getsettingAct">	308	<action name="getsettingAct">
257	<property name="text">	309	<property name="text">
258	<string>Параметры соединения</string>	310	<string>Параметры соединения</string>
259	</property>	311	</property>
260	</action>	312	</action>
261	</widget>	313	</widget>
262	<layoutdefault spacing="6" margin="11"/>	314	<layoutdefault spacing="6" margin="11"/>
263	<resources/>	315	<resources/>
264	<connections/>	316	<connections/>
265	</ui>	317	</ui>

Хранилища Subversion OpenInventory

(root)/trunk/DBViewer/mainwindow.ui @ 147 - Редакция 141 → 144