Fixed some accelerators, variable names and some layoting..

diff --git a/eonsl/widgets/closeweapon.ui b/eonsl/widgets/closeweapon.ui
index da6ca7a6b6de33a88beb4c275ddf61b2e6475bb7..e93c417ac46ce6ef9d6ddd69671f15e2949175f0 100644 (file)
--- a/eonsl/widgets/closeweapon.ui
+++ b/eonsl/widgets/closeweapon.ui
@@ -14,7 +14,7 @@
             <x>0</x>
             <y>0</y>
             <width>369</width>
-            <height>416</height>
+            <height>412</height>
         </rect>
     </property>
     <property stdset="1">
@@ -41,7 +41,7 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+        <widget row="6"  column="0"  rowspan="1"  colspan="5" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -143,7 +143,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget row="2"  column="0"  rowspan="1"  colspan="2" >
+        <widget row="2"  column="0"  rowspan="1"  colspan="5" >
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
@@ -372,7 +372,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget row="4"  column="0"  rowspan="1"  colspan="2" >
+        <widget row="4"  column="0"  rowspan="1"  colspan="5" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -629,7 +629,7 @@
                 </size>
             </property>
         </spacer>
-        <spacer row="3"  column="1" >
+        <spacer row="3"  column="3" >
             <property>
                 <name>name</name>
                 <cstring>Spacer10</cstring>
@@ -671,13 +671,34 @@
                 </size>
             </property>
         </spacer>
-        <widget row="0"  column="0"  rowspan="1"  colspan="2" >
+        <spacer row="0"  column="1" >
+            <property>
+                <name>name</name>
+                <cstring>Spacer5</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget row="0"  column="2" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout31</cstring>
+                <cstring>Layout10</cstring>
             </property>
-            <hbox>
+            <vbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -690,7 +711,7 @@
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout30</cstring>
+                        <cstring>Layout3</cstring>
                     </property>
                     <vbox>
                         <property stdset="1">
@@ -702,104 +723,150 @@
                             <number>6</number>
                         </property>
                         <widget>
-                            <class>QLayoutWidget</class>
+                            <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>Layout2</cstring>
+                                <cstring>TextLabel2</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Färdighet</string>
                             </property>
-                            <vbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
-                                    <class>QLabel</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>Na&amp;mn</string>
-                                    </property>
-                                    <property>
-                                        <name>buddy</name>
-                                        <cstring>NameEdit</cstring>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QLineEdit</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>NameEdit</cstring>
-                                    </property>
-                                </widget>
-                            </vbox>
-                        </widget>
-                        <spacer>
                             <property>
+                                <name>buddy</name>
+                                <cstring>SkillCombo</cstring>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QComboBox</class>
+                            <property stdset="1">
                                 <name>name</name>
-                                <cstring>Spacer12</cstring>
+                                <cstring>SkillCombo</cstring>
                             </property>
+                        </widget>
+                    </vbox>
+                </widget>
+                <widget>
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout6</cstring>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
+                            <class>QLabel</class>
                             <property stdset="1">
-                                <name>orientation</name>
-                                <enum>Vertical</enum>
+                                <name>name</name>
+                                <cstring>TextLabel6</cstring>
                             </property>
                             <property stdset="1">
-                                <name>sizeType</name>
-                                <enum>Expanding</enum>
+                                <name>text</name>
+                                <string>S&amp;tyrkekrav</string>
                             </property>
                             <property>
-                                <name>sizeHint</name>
-                                <size>
-                                    <width>20</width>
-                                    <height>20</height>
-                                </size>
+                                <name>buddy</name>
+                                <cstring>StrengthSpin</cstring>
                             </property>
-                        </spacer>
+                        </widget>
                         <widget>
-                            <class>QCheckBox</class>
+                            <class>QSpinBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>HandCheck</cstring>
+                                <cstring>StrengthSpin</cstring>
+                            </property>
+                        </widget>
+                    </vbox>
+                </widget>
+            </vbox>
+        </widget>
+        <spacer row="0"  column="3" >
+            <property>
+                <name>name</name>
+                <cstring>Spacer6</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget row="0"  column="4" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout11</cstring>
+            </property>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout4</cstring>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>TextLabel3</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Tv&amp;å handsvapen</string>
+                                <string>V&amp;ikt</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>WeightSpin</cstring>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QSpinBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>WeightSpin</cstring>
                             </property>
                         </widget>
                     </vbox>
                 </widget>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer5</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
                 <widget>
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout10</cstring>
+                        <cstring>Layout5</cstring>
                     </property>
                     <vbox>
                         <property stdset="1">
@@ -811,111 +878,51 @@
                             <number>6</number>
                         </property>
                         <widget>
-                            <class>QLayoutWidget</class>
+                            <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>Layout3</cstring>
+                                <cstring>TextLabel5</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Längd</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>LengthSpin</cstring>
                             </property>
-                            <vbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
-                                    <class>QLabel</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>&amp;Färdighet</string>
-                                    </property>
-                                    <property>
-                                        <name>buddy</name>
-                                        <cstring>SkillCombo</cstring>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QComboBox</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>SkillCombo</cstring>
-                                    </property>
-                                </widget>
-                            </vbox>
                         </widget>
                         <widget>
-                            <class>QLayoutWidget</class>
+                            <class>QSpinBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>Layout6</cstring>
+                                <cstring>LengthSpin</cstring>
                             </property>
-                            <vbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
-                                    <class>QLabel</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>TextLabel6</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>S&amp;tyrkekrav</string>
-                                    </property>
-                                    <property>
-                                        <name>buddy</name>
-                                        <cstring>StrengthSpin</cstring>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QSpinBox</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>StrengthSpin</cstring>
-                                    </property>
-                                </widget>
-                            </vbox>
                         </widget>
                     </vbox>
                 </widget>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer6</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
+            </vbox>
+        </widget>
+        <widget row="0"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout43</cstring>
+            </property>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
                 <widget>
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout11</cstring>
+                        <cstring>Layout2</cstring>
                     </property>
                     <vbox>
                         <property stdset="1">
@@ -927,86 +934,81 @@
                             <number>6</number>
                         </property>
                         <widget>
-                            <class>QLayoutWidget</class>
+                            <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>Layout4</cstring>
+                                <cstring>TextLabel1</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Na&amp;mn</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>NameEdit</cstring>
                             </property>
-                            <vbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
-                                    <class>QLabel</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>V&amp;ikt</string>
-                                    </property>
-                                    <property>
-                                        <name>buddy</name>
-                                        <cstring>WeightSpin</cstring>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QSpinBox</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>WeightSpin</cstring>
-                                    </property>
-                                </widget>
-                            </vbox>
                         </widget>
                         <widget>
-                            <class>QLayoutWidget</class>
+                            <class>QLineEdit</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>Layout5</cstring>
+                                <cstring>NameEdit</cstring>
                             </property>
-                            <vbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
+                        </widget>
+                    </vbox>
+                </widget>
+                <widget>
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout42</cstring>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>TextLabel1_2</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Fa&amp;ttning</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>GripCombo</cstring>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QComboBox</class>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>En hand (1H)</string>
                                 </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>Två händer (2H)</string>
                                 </property>
-                                <widget>
-                                    <class>QLabel</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>&amp;Längd</string>
-                                    </property>
-                                    <property>
-                                        <name>buddy</name>
-                                        <cstring>LengthSpin</cstring>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QSpinBox</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>LengthSpin</cstring>
-                                    </property>
-                                </widget>
-                            </vbox>
+                            </item>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>GripCombo</cstring>
+                            </property>
                         </widget>
                     </vbox>
                 </widget>
-            </hbox>
+            </vbox>
         </widget>
     </grid>
 </widget>
@@ -1041,7 +1043,6 @@
 </connections>
 <tabstops>
     <tabstop>NameEdit</tabstop>
-    <tabstop>HandCheck</tabstop>
     <tabstop>SkillCombo</tabstop>
     <tabstop>StrengthSpin</tabstop>
     <tabstop>WeightSpin</tabstop>

diff --git a/eonsl/widgets/rangeweapon.ui b/eonsl/widgets/rangeweapon.ui
index fe421afd5a5fa9997834ea66900130b33dc56ed0..5b557a6550ca499dddd9506c9d499251050120cf 100644 (file)
--- a/eonsl/widgets/rangeweapon.ui
+++ b/eonsl/widgets/rangeweapon.ui
@@ -11,13 +11,13 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>440</width>
-            <height>479</height>
+            <width>395</width>
+            <height>390</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
-        <string>NoName</string>
+        <string>Avståndsvapen</string>
     </property>
     <grid>
         <property stdset="1">
@@ -66,7 +66,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Namn</string>
+                                <string>&amp;Namn</string>
                             </property>
                             <property>
                                 <name>buddy</name>
@@ -105,7 +105,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Färdighet</string>
+                                <string>&amp;Färdighet</string>
                             </property>
                             <property>
                                 <name>buddy</name>
@@ -148,7 +148,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Vikt (i gram)</string>
+                                <string>V&amp;ikt (i gram)</string>
                             </property>
                             <property>
                                 <name>buddy</name>
@@ -191,7 +191,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Längd (i cm)</string>
+                                <string>&amp;Längd (i cm)</string>
                             </property>
                             <property>
                                 <name>buddy</name>
@@ -573,7 +573,11 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Grundskada</string>
+                                <string>&amp;Grundskada</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>BasicDamageCombo</cstring>
                             </property>
                         </widget>
                         <widget>
@@ -604,7 +608,7 @@
                             </item>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>GroundDamageCombo</cstring>
+                                <cstring>BasicDamageCombo</cstring>
                             </property>
                             <property stdset="1">
                                 <name>insertionPolicy</name>
@@ -686,7 +690,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Styrkekrav</string>
+                        <string>St&amp;yrkekrav</string>
                     </property>
                     <property>
                         <name>buddy</name>
@@ -935,7 +939,11 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Fattning</string>
+                                <string>Fa&amp;ttning</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>GripCombo</cstring>
                             </property>
                         </widget>
                         <widget>
@@ -943,24 +951,24 @@
                             <item>
                                 <property>
                                     <name>text</name>
-                                    <string>En hand</string>
+                                    <string>En hand (1H)</string>
                                 </property>
                             </item>
                             <item>
                                 <property>
                                     <name>text</name>
-                                    <string>Två händer</string>
+                                    <string>Två händer (2H)</string>
                                 </property>
                             </item>
                             <item>
                                 <property>
                                     <name>text</name>
-                                    <string>Endast två händer</string>
+                                    <string>Endast två händer (2X)</string>
                                 </property>
                             </item>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>FattCombo</cstring>
+                                <cstring>GripCombo</cstring>
                             </property>
                         </widget>
                         <spacer>
@@ -1049,7 +1057,7 @@
                                     </property>
                                     <property stdset="1">
                                         <name>text</name>
-                                        <string>Orginal</string>
+                                        <string>O&amp;rginal</string>
                                     </property>
                                     <property>
                                         <name>buddy</name>
@@ -1064,7 +1072,7 @@
                                     </property>
                                     <property stdset="1">
                                         <name>text</name>
-                                        <string>Kvar</string>
+                                        <string>&amp;Kvar</string>
                                     </property>
                                     <property>
                                         <name>buddy</name>