# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1310702072 -10800
# Node ID 4e8f2bbe8426d59fb448bf56b44486acfc4b48d9
# Parent  dd02002227a2c40ece5a94d70b0e7e2307b964d1
doing the gui

diff -r dd02002227a2 -r 4e8f2bbe8426 gui/gui.cc
--- a/gui/gui.cc	Thu Jul 14 15:40:20 2011 +0300
+++ b/gui/gui.cc	Fri Jul 15 06:54:32 2011 +0300
@@ -5,6 +5,10 @@
 #include "gui.h"
 #include "combjs.h"
 
+static void add_to_list(int jsidx, QListWidget *list);
+static QListWidgetItem *get_selected(QListWidget *list);
+static int find_item(QListWidget *list, int jsidx);
+
 static std::vector<Joystick> jsvec;
 
 MainWindow::MainWindow(QWidget *parent)
@@ -16,14 +20,16 @@
 
 	list_js->clear();
 	for(int i=0; i<num_js; i++) {
-		QListWidgetItem *item = new QListWidgetItem(jsvec[i].name.c_str());
-		item->setData(Qt::UserRole, i);
-		item->setToolTip(jsvec[i].dev.c_str());
-
-		list_js->addItem(item);
+		add_to_list(i, list_js);
 	}
 
 	connect(list_js, SIGNAL(itemSelectionChanged()), this, SLOT(jslist_select()));
+	connect(list_newdev, SIGNAL(itemSelectionChanged()), this, SLOT(clist_select()));
+
+	connect(action_addjs, SIGNAL(triggered()), this, SLOT(add_js()));
+	connect(action_remove, SIGNAL(triggered()), this, SLOT(remove_js()));
+	connect(action_combine, SIGNAL(triggered()), this, SLOT(start_virt()));
+	connect(action_delete, SIGNAL(triggered()), this, SLOT(stop_virt()));
 }
 
 
@@ -44,12 +50,97 @@
 /* slots */
 void MainWindow::jslist_select()
 {
-	QList<QListWidgetItem*> sel_list = list_js->selectedItems();
-	QListWidgetItem *item = sel_list.isEmpty() ? 0 : sel_list.first();
+	QListWidgetItem *item = get_selected(list_js);
 
-	if(item && jsvec[item->data(Qt::UserRole).toInt()].isvirt) {
-		bn_del_virt->setEnabled(true);
+	if(item) {
+		int idx = item->data(Qt::UserRole).toInt();
+
+		bn_add->setEnabled(true);
+		if(jsvec[idx].isvirt) {
+			bn_del_virt->setEnabled(true);
+		} else {
+			bn_del_virt->setEnabled(false);
+		}
+
+		lb_name->setText(jsvec[idx].name.c_str());
+		lb_dev->setText(jsvec[idx].dev.c_str());
+		lb_axes->setText(QString::number(jsvec[idx].num_axes));
+		lb_buttons->setText(QString::number(jsvec[idx].num_bn));
+
 	} else {
+		bn_add->setEnabled(false);
 		bn_del_virt->setEnabled(false);
+
+		lb_name->setText("");
+		lb_dev->setText("");
+		lb_axes->setText("");
+		lb_buttons->setText("");
 	}
 }
+
+void MainWindow::clist_select()
+{
+	QListWidgetItem *item = get_selected(list_newdev);
+
+	bn_remove->setEnabled(item != 0);
+}
+
+void MainWindow::add_js()
+{
+	QListWidgetItem *item = get_selected(list_js);
+	if(!item) {
+		return;
+	}
+
+	int idx = item->data(Qt::UserRole).toInt();
+	if(find_item(list_newdev, idx) == -1) {
+		add_to_list(idx, list_newdev);
+		bn_create->setEnabled(true);
+	}
+}
+
+void MainWindow::remove_js()
+{
+	QListWidgetItem *item = get_selected(list_newdev);
+	if(item) {
+		list_newdev->takeItem(list_newdev->row(item));
+		delete item;
+
+		if(list_newdev->count() == 0) {
+			bn_create->setEnabled(false);
+		}
+	}
+}
+
+void MainWindow::start_virt()
+{
+}
+
+void MainWindow::stop_virt()
+{
+}
+
+static void add_to_list(int jsidx, QListWidget *list)
+{
+	QListWidgetItem *item = new QListWidgetItem(jsvec[jsidx].name.c_str());
+	item->setData(Qt::UserRole, jsidx);
+	item->setToolTip(jsvec[jsidx].dev.c_str());
+	list->addItem(item);
+}
+
+static QListWidgetItem *get_selected(QListWidget *list)
+{
+	QList<QListWidgetItem*> sel_list = list->selectedItems();
+	return sel_list.isEmpty() ? 0 : sel_list.first();
+}
+
+static int find_item(QListWidget *list, int jsidx)
+{
+	int num = list->count();
+	for(int i=0; i<num; i++) {
+		if(list->item(i)->data(Qt::UserRole).toInt() == jsidx) {
+			return i;
+		}
+	}
+	return -1;
+}
diff -r dd02002227a2 -r 4e8f2bbe8426 gui/gui.h
--- a/gui/gui.h	Thu Jul 14 15:40:20 2011 +0300
+++ b/gui/gui.h	Fri Jul 15 06:54:32 2011 +0300
@@ -7,6 +7,13 @@
 	Q_OBJECT
 private slots:
 	void jslist_select();
+	void clist_select();
+
+	void add_js();
+	void remove_js();
+
+	void start_virt();
+	void stop_virt();
 
 private:
 	void closeEvent(QCloseEvent *ev);
diff -r dd02002227a2 -r 4e8f2bbe8426 gui/main.ui
--- a/gui/main.ui	Thu Jul 14 15:40:20 2011 +0300
+++ b/gui/main.ui	Fri Jul 15 06:54:32 2011 +0300
@@ -14,9 +14,9 @@
    <string>Joystick Combiner</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout_4">
+   <layout class="QVBoxLayout" name="verticalLayout_6">
     <item>
-     <widget class="QSplitter" name="splitter_3">
+     <widget class="QSplitter" name="splitter">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
@@ -31,17 +31,30 @@
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
           <widget class="QListWidget" name="list_js">
+           <property name="showDropIndicator" stdset="0">
+            <bool>false</bool>
+           </property>
            <property name="dragEnabled">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="dragDropMode">
-            <enum>QAbstractItemView::DragDrop</enum>
+            <enum>QAbstractItemView::NoDragDrop</enum>
            </property>
           </widget>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
+            <widget class="QPushButton" name="bn_add">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="text">
+              <string>Add joystick</string>
+             </property>
+            </widget>
+           </item>
+           <item>
             <spacer name="horizontalSpacer_2">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
@@ -83,12 +96,16 @@
             </widget>
            </item>
            <item>
-            <widget class="QLineEdit" name="tx_devname"/>
+            <widget class="QLineEdit" name="tx_devname">
+             <property name="text">
+              <string>combjs virtual joystick</string>
+             </property>
+            </widget>
            </item>
           </layout>
          </item>
          <item>
-          <widget class="DropList" name="list_newdev">
+          <widget class="QListWidget" name="list_newdev">
            <property name="acceptDrops">
             <bool>true</bool>
            </property>
@@ -96,13 +113,13 @@
             <bool>true</bool>
            </property>
            <property name="dragDropOverwriteMode">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="dragDropMode">
-            <enum>QAbstractItemView::DragDrop</enum>
+            <enum>QAbstractItemView::InternalMove</enum>
            </property>
            <property name="defaultDropAction">
-            <enum>Qt::CopyAction</enum>
+            <enum>Qt::MoveAction</enum>
            </property>
            <property name="alternatingRowColors">
             <bool>false</bool>
@@ -115,7 +132,7 @@
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
-            <widget class="QPushButton" name="pushButton_3">
+            <widget class="QPushButton" name="bn_create">
              <property name="enabled">
               <bool>false</bool>
              </property>
@@ -138,7 +155,7 @@
             </spacer>
            </item>
            <item>
-            <widget class="QPushButton" name="pushButton_2">
+            <widget class="QPushButton" name="bn_remove">
              <property name="enabled">
               <bool>false</bool>
              </property>
@@ -152,62 +169,125 @@
         </layout>
        </widget>
       </widget>
-      <widget class="QSplitter" name="splitter">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <widget class="QGroupBox" name="groupBox_3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>347</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Joystick information</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <item>
-          <widget class="QListWidget" name="list_joyinfo"/>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QGroupBox" name="groupBox_4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="title">
-         <string>Joystick test</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_5">
-         <item>
-          <widget class="QScrollArea" name="test_area">
-           <property name="widgetResizable">
-            <bool>true</bool>
-           </property>
-           <widget class="QWidget" name="scrollAreaWidgetContents">
-            <property name="geometry">
-             <rect>
-              <x>0</x>
-              <y>0</y>
-              <width>360</width>
-              <height>158</height>
-             </rect>
-            </property>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </widget>
+      <widget class="QWidget" name="">
+       <layout class="QVBoxLayout" name="verticalLayout_4">
+        <item>
+         <widget class="QGroupBox" name="groupBox_3">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="title">
+           <string>Joystick information</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <layout class="QFormLayout" name="formLayout">
+             <property name="fieldGrowthPolicy">
+              <enum>QFormLayout::ExpandingFieldsGrow</enum>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_2">
+               <property name="text">
+                <string>Name:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLabel" name="lb_name">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_3">
+               <property name="text">
+                <string>Device:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLabel" name="lb_dev">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="label_5">
+               <property name="text">
+                <string>Axes:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QLabel" name="lb_axes">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="label_6">
+               <property name="text">
+                <string>Buttons:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1">
+              <widget class="QLabel" name="lb_buttons">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="groupBox_4">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="title">
+           <string>Joystick test</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <item>
+            <widget class="QScrollArea" name="test_area">
+             <property name="widgetResizable">
+              <bool>true</bool>
+             </property>
+             <widget class="QWidget" name="scrollAreaWidgetContents">
+              <property name="geometry">
+               <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>321</width>
+                <height>394</height>
+               </rect>
+              </property>
+             </widget>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </widget>
     </item>
@@ -226,6 +306,7 @@
     <property name="title">
      <string>Joystick</string>
     </property>
+    <addaction name="action_addjs"/>
     <addaction name="action_combine"/>
     <addaction name="action_delete"/>
     <addaction name="action_quit"/>
@@ -266,14 +347,17 @@
     <string>Quit</string>
    </property>
   </action>
+  <action name="action_addjs">
+   <property name="text">
+    <string>Add joystick</string>
+   </property>
+  </action>
+  <action name="action_remove">
+   <property name="text">
+    <string>Remove</string>
+   </property>
+  </action>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>DropList</class>
-   <extends>QListWidget</extends>
-   <header>droplist.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>
@@ -292,5 +376,69 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>bn_add</sender>
+   <signal>clicked()</signal>
+   <receiver>action_addjs</receiver>
+   <slot>trigger()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>63</x>
+     <y>267</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>bn_create</sender>
+   <signal>clicked()</signal>
+   <receiver>action_combine</receiver>
+   <slot>trigger()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>58</x>
+     <y>559</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>bn_remove</sender>
+   <signal>clicked()</signal>
+   <receiver>action_remove</receiver>
+   <slot>trigger()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>345</x>
+     <y>559</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>bn_del_virt</sender>
+   <signal>clicked()</signal>
+   <receiver>action_delete</receiver>
+   <slot>trigger()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>315</x>
+     <y>267</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>