1.1 --- a/gui/main.ui	Thu Jul 14 15:40:20 2011 +0300
     1.2 +++ b/gui/main.ui	Fri Jul 15 06:54:32 2011 +0300
     1.3 @@ -14,9 +14,9 @@
     1.4     <string>Joystick Combiner</string>
     1.5    </property>
     1.6    <widget class="QWidget" name="centralwidget">
     1.7 -   <layout class="QVBoxLayout" name="verticalLayout_4">
     1.8 +   <layout class="QVBoxLayout" name="verticalLayout_6">
     1.9      <item>
    1.10 -     <widget class="QSplitter" name="splitter_3">
    1.11 +     <widget class="QSplitter" name="splitter">
    1.12        <property name="orientation">
    1.13         <enum>Qt::Horizontal</enum>
    1.14        </property>
    1.15 @@ -31,17 +31,30 @@
    1.16          <layout class="QVBoxLayout" name="verticalLayout_3">
    1.17           <item>
    1.18            <widget class="QListWidget" name="list_js">
    1.19 +           <property name="showDropIndicator" stdset="0">
    1.20 +            <bool>false</bool>
    1.21 +           </property>
    1.22             <property name="dragEnabled">
    1.23 -            <bool>true</bool>
    1.24 +            <bool>false</bool>
    1.25             </property>
    1.26             <property name="dragDropMode">
    1.27 -            <enum>QAbstractItemView::DragDrop</enum>
    1.28 +            <enum>QAbstractItemView::NoDragDrop</enum>
    1.29             </property>
    1.30            </widget>
    1.31           </item>
    1.32           <item>
    1.33            <layout class="QHBoxLayout" name="horizontalLayout_3">
    1.34             <item>
    1.35 +            <widget class="QPushButton" name="bn_add">
    1.36 +             <property name="enabled">
    1.37 +              <bool>false</bool>
    1.38 +             </property>
    1.39 +             <property name="text">
    1.40 +              <string>Add joystick</string>
    1.41 +             </property>
    1.42 +            </widget>
    1.43 +           </item>
    1.44 +           <item>
    1.45              <spacer name="horizontalSpacer_2">
    1.46               <property name="orientation">
    1.47                <enum>Qt::Horizontal</enum>
    1.48 @@ -83,12 +96,16 @@
    1.49              </widget>
    1.50             </item>
    1.51             <item>
    1.52 -            <widget class="QLineEdit" name="tx_devname"/>
    1.53 +            <widget class="QLineEdit" name="tx_devname">
    1.54 +             <property name="text">
    1.55 +              <string>combjs virtual joystick</string>
    1.56 +             </property>
    1.57 +            </widget>
    1.58             </item>
    1.59            </layout>
    1.60           </item>
    1.61           <item>
    1.62 -          <widget class="DropList" name="list_newdev">
    1.63 +          <widget class="QListWidget" name="list_newdev">
    1.64             <property name="acceptDrops">
    1.65              <bool>true</bool>
    1.66             </property>
    1.67 @@ -96,13 +113,13 @@
    1.68              <bool>true</bool>
    1.69             </property>
    1.70             <property name="dragDropOverwriteMode">
    1.71 -            <bool>true</bool>
    1.72 +            <bool>false</bool>
    1.73             </property>
    1.74             <property name="dragDropMode">
    1.75 -            <enum>QAbstractItemView::DragDrop</enum>
    1.76 +            <enum>QAbstractItemView::InternalMove</enum>
    1.77             </property>
    1.78             <property name="defaultDropAction">
    1.79 -            <enum>Qt::CopyAction</enum>
    1.80 +            <enum>Qt::MoveAction</enum>
    1.81             </property>
    1.82             <property name="alternatingRowColors">
    1.83              <bool>false</bool>
    1.84 @@ -115,7 +132,7 @@
    1.85           <item>
    1.86            <layout class="QHBoxLayout" name="horizontalLayout_2">
    1.87             <item>
    1.88 -            <widget class="QPushButton" name="pushButton_3">
    1.89 +            <widget class="QPushButton" name="bn_create">
    1.90               <property name="enabled">
    1.91                <bool>false</bool>
    1.92               </property>
    1.93 @@ -138,7 +155,7 @@
    1.94              </spacer>
    1.95             </item>
    1.96             <item>
    1.97 -            <widget class="QPushButton" name="pushButton_2">
    1.98 +            <widget class="QPushButton" name="bn_remove">
    1.99               <property name="enabled">
   1.100                <bool>false</bool>
   1.101               </property>
   1.102 @@ -152,62 +169,125 @@
   1.103          </layout>
   1.104         </widget>
   1.105        </widget>
   1.106 -      <widget class="QSplitter" name="splitter">
   1.107 -       <property name="orientation">
   1.108 -        <enum>Qt::Vertical</enum>
   1.109 -       </property>
   1.110 -       <widget class="QGroupBox" name="groupBox_3">
   1.111 -        <property name="sizePolicy">
   1.112 -         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
   1.113 -          <horstretch>0</horstretch>
   1.114 -          <verstretch>0</verstretch>
   1.115 -         </sizepolicy>
   1.116 -        </property>
   1.117 -        <property name="minimumSize">
   1.118 -         <size>
   1.119 -          <width>0</width>
   1.120 -          <height>347</height>
   1.121 -         </size>
   1.122 -        </property>
   1.123 -        <property name="title">
   1.124 -         <string>Joystick information</string>
   1.125 -        </property>
   1.126 -        <layout class="QVBoxLayout" name="verticalLayout">
   1.127 -         <item>
   1.128 -          <widget class="QListWidget" name="list_joyinfo"/>
   1.129 -         </item>
   1.130 -        </layout>
   1.131 -       </widget>
   1.132 -       <widget class="QGroupBox" name="groupBox_4">
   1.133 -        <property name="sizePolicy">
   1.134 -         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
   1.135 -          <horstretch>0</horstretch>
   1.136 -          <verstretch>0</verstretch>
   1.137 -         </sizepolicy>
   1.138 -        </property>
   1.139 -        <property name="title">
   1.140 -         <string>Joystick test</string>
   1.141 -        </property>
   1.142 -        <layout class="QVBoxLayout" name="verticalLayout_5">
   1.143 -         <item>
   1.144 -          <widget class="QScrollArea" name="test_area">
   1.145 -           <property name="widgetResizable">
   1.146 -            <bool>true</bool>
   1.147 -           </property>
   1.148 -           <widget class="QWidget" name="scrollAreaWidgetContents">
   1.149 -            <property name="geometry">
   1.150 -             <rect>
   1.151 -              <x>0</x>
   1.152 -              <y>0</y>
   1.153 -              <width>360</width>
   1.154 -              <height>158</height>
   1.155 -             </rect>
   1.156 -            </property>
   1.157 -           </widget>
   1.158 -          </widget>
   1.159 -         </item>
   1.160 -        </layout>
   1.161 -       </widget>
   1.162 +      <widget class="QWidget" name="">
   1.163 +       <layout class="QVBoxLayout" name="verticalLayout_4">
   1.164 +        <item>
   1.165 +         <widget class="QGroupBox" name="groupBox_3">
   1.166 +          <property name="sizePolicy">
   1.167 +           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
   1.168 +            <horstretch>0</horstretch>
   1.169 +            <verstretch>0</verstretch>
   1.170 +           </sizepolicy>
   1.171 +          </property>
   1.172 +          <property name="minimumSize">
   1.173 +           <size>
   1.174 +            <width>0</width>
   1.175 +            <height>0</height>
   1.176 +           </size>
   1.177 +          </property>
   1.178 +          <property name="title">
   1.179 +           <string>Joystick information</string>
   1.180 +          </property>
   1.181 +          <layout class="QVBoxLayout" name="verticalLayout">
   1.182 +           <item>
   1.183 +            <layout class="QFormLayout" name="formLayout">
   1.184 +             <property name="fieldGrowthPolicy">
   1.185 +              <enum>QFormLayout::ExpandingFieldsGrow</enum>
   1.186 +             </property>
   1.187 +             <item row="0" column="0">
   1.188 +              <widget class="QLabel" name="label_2">
   1.189 +               <property name="text">
   1.190 +                <string>Name:</string>
   1.191 +               </property>
   1.192 +              </widget>
   1.193 +             </item>
   1.194 +             <item row="0" column="1">
   1.195 +              <widget class="QLabel" name="lb_name">
   1.196 +               <property name="text">
   1.197 +                <string/>
   1.198 +               </property>
   1.199 +              </widget>
   1.200 +             </item>
   1.201 +             <item row="1" column="0">
   1.202 +              <widget class="QLabel" name="label_3">
   1.203 +               <property name="text">
   1.204 +                <string>Device:</string>
   1.205 +               </property>
   1.206 +              </widget>
   1.207 +             </item>
   1.208 +             <item row="1" column="1">
   1.209 +              <widget class="QLabel" name="lb_dev">
   1.210 +               <property name="text">
   1.211 +                <string/>
   1.212 +               </property>
   1.213 +              </widget>
   1.214 +             </item>
   1.215 +             <item row="2" column="0">
   1.216 +              <widget class="QLabel" name="label_5">
   1.217 +               <property name="text">
   1.218 +                <string>Axes:</string>
   1.219 +               </property>
   1.220 +              </widget>
   1.221 +             </item>
   1.222 +             <item row="2" column="1">
   1.223 +              <widget class="QLabel" name="lb_axes">
   1.224 +               <property name="text">
   1.225 +                <string/>
   1.226 +               </property>
   1.227 +              </widget>
   1.228 +             </item>
   1.229 +             <item row="3" column="0">
   1.230 +              <widget class="QLabel" name="label_6">
   1.231 +               <property name="text">
   1.232 +                <string>Buttons:</string>
   1.233 +               </property>
   1.234 +              </widget>
   1.235 +             </item>
   1.236 +             <item row="3" column="1">
   1.237 +              <widget class="QLabel" name="lb_buttons">
   1.238 +               <property name="text">
   1.239 +                <string/>
   1.240 +               </property>
   1.241 +              </widget>
   1.242 +             </item>
   1.243 +            </layout>
   1.244 +           </item>
   1.245 +          </layout>
   1.246 +         </widget>
   1.247 +        </item>
   1.248 +        <item>
   1.249 +         <widget class="QGroupBox" name="groupBox_4">
   1.250 +          <property name="sizePolicy">
   1.251 +           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
   1.252 +            <horstretch>0</horstretch>
   1.253 +            <verstretch>0</verstretch>
   1.254 +           </sizepolicy>
   1.255 +          </property>
   1.256 +          <property name="title">
   1.257 +           <string>Joystick test</string>
   1.258 +          </property>
   1.259 +          <layout class="QVBoxLayout" name="verticalLayout_5">
   1.260 +           <item>
   1.261 +            <widget class="QScrollArea" name="test_area">
   1.262 +             <property name="widgetResizable">
   1.263 +              <bool>true</bool>
   1.264 +             </property>
   1.265 +             <widget class="QWidget" name="scrollAreaWidgetContents">
   1.266 +              <property name="geometry">
   1.267 +               <rect>
   1.268 +                <x>0</x>
   1.269 +                <y>0</y>
   1.270 +                <width>321</width>
   1.271 +                <height>394</height>
   1.272 +               </rect>
   1.273 +              </property>
   1.274 +             </widget>
   1.275 +            </widget>
   1.276 +           </item>
   1.277 +          </layout>
   1.278 +         </widget>
   1.279 +        </item>
   1.280 +       </layout>
   1.281        </widget>
   1.282       </widget>
   1.283      </item>
   1.284 @@ -226,6 +306,7 @@
   1.285      <property name="title">
   1.286       <string>Joystick</string>
   1.287      </property>
   1.288 +    <addaction name="action_addjs"/>
   1.289      <addaction name="action_combine"/>
   1.290      <addaction name="action_delete"/>
   1.291      <addaction name="action_quit"/>
   1.292 @@ -266,14 +347,17 @@
   1.293      <string>Quit</string>
   1.294     </property>
   1.295    </action>
   1.296 +  <action name="action_addjs">
   1.297 +   <property name="text">
   1.298 +    <string>Add joystick</string>
   1.299 +   </property>
   1.300 +  </action>
   1.301 +  <action name="action_remove">
   1.302 +   <property name="text">
   1.303 +    <string>Remove</string>
   1.304 +   </property>
   1.305 +  </action>
   1.306   </widget>
   1.307 - <customwidgets>
   1.308 -  <customwidget>
   1.309 -   <class>DropList</class>
   1.310 -   <extends>QListWidget</extends>
   1.311 -   <header>droplist.h</header>
   1.312 -  </customwidget>
   1.313 - </customwidgets>
   1.314   <resources/>
   1.315   <connections>
   1.316    <connection>
   1.317 @@ -292,5 +376,69 @@
   1.318      </hint>
   1.319     </hints>
   1.320    </connection>
   1.321 +  <connection>
   1.322 +   <sender>bn_add</sender>
   1.323 +   <signal>clicked()</signal>
   1.324 +   <receiver>action_addjs</receiver>
   1.325 +   <slot>trigger()</slot>
   1.326 +   <hints>
   1.327 +    <hint type="sourcelabel">
   1.328 +     <x>63</x>
   1.329 +     <y>267</y>
   1.330 +    </hint>
   1.331 +    <hint type="destinationlabel">
   1.332 +     <x>-1</x>
   1.333 +     <y>-1</y>
   1.334 +    </hint>
   1.335 +   </hints>
   1.336 +  </connection>
   1.337 +  <connection>
   1.338 +   <sender>bn_create</sender>
   1.339 +   <signal>clicked()</signal>
   1.340 +   <receiver>action_combine</receiver>
   1.341 +   <slot>trigger()</slot>
   1.342 +   <hints>
   1.343 +    <hint type="sourcelabel">
   1.344 +     <x>58</x>
   1.345 +     <y>559</y>
   1.346 +    </hint>
   1.347 +    <hint type="destinationlabel">
   1.348 +     <x>-1</x>
   1.349 +     <y>-1</y>
   1.350 +    </hint>
   1.351 +   </hints>
   1.352 +  </connection>
   1.353 +  <connection>
   1.354 +   <sender>bn_remove</sender>
   1.355 +   <signal>clicked()</signal>
   1.356 +   <receiver>action_remove</receiver>
   1.357 +   <slot>trigger()</slot>
   1.358 +   <hints>
   1.359 +    <hint type="sourcelabel">
   1.360 +     <x>345</x>
   1.361 +     <y>559</y>
   1.362 +    </hint>
   1.363 +    <hint type="destinationlabel">
   1.364 +     <x>-1</x>
   1.365 +     <y>-1</y>
   1.366 +    </hint>
   1.367 +   </hints>
   1.368 +  </connection>
   1.369 +  <connection>
   1.370 +   <sender>bn_del_virt</sender>
   1.371 +   <signal>clicked()</signal>
   1.372 +   <receiver>action_delete</receiver>
   1.373 +   <slot>trigger()</slot>
   1.374 +   <hints>
   1.375 +    <hint type="sourcelabel">
   1.376 +     <x>315</x>
   1.377 +     <y>267</y>
   1.378 +    </hint>
   1.379 +    <hint type="destinationlabel">
   1.380 +     <x>-1</x>
   1.381 +     <y>-1</y>
   1.382 +    </hint>
   1.383 +   </hints>
   1.384 +  </connection>
   1.385   </connections>
   1.386  </ui>