Selection window bugfix

Fixed a minor bug that prevented sorting keysets by device type.

diff --git a/mainwindow.cpp b/mainwindow.cpp
index a4a8b60..ec56cf0 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1091,7 +1091,7 @@ void MainWindow::populateFavorites()
   PIRMakeName make;
   QString name;
   unsigned int id;
-  PIRKeysetWidgetItem *kwi;
+//  PIRKeysetWidgetItem *kwi;
 
   while (index < size)
   {
@@ -1101,9 +1101,9 @@ void MainWindow::populateFavorites()
     name = makeManager.getMakeString(make);
     name.append(" ");
     name.append(myKeysets->getDisplayName(id));
-    kwi = new PIRKeysetWidgetItem(name, id, make);
-    myKeysets->populateDeviceTypes(kwi, id);
-    ui->favoriteKeysetsWidget->addItem(kwi);
+//    kwi = new PIRKeysetWidgetItem(name, id, make);
+//    myKeysets->populateDeviceTypes(kwi, id);
+    ui->favoriteKeysetsWidget->addItem(new PIRKeysetWidgetItem(name, id, make));
     ++index;
   }
 

diff --git a/pierogi.pro.user b/pierogi.pro.user
index e016973..0d7facf 100644 (file)
--- a/pierogi.pro.user
+++ b/pierogi.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.0, 2012-01-14T13:10:14. -->
+<!-- Written by Qt Creator 2.4.0, 2012-01-15T09:43:31. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -174,18 +174,22 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">MaemoMountAndInstallDeployStep</value>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles">
        <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_0_1_armel.deb</value>
+       <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_0_armel.deb</value>
        <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_0_1_armel.deb</value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
        <value type="QString">192.168.0.15</value>
+       <value type="QString">192.168.0.15</value>
        <value type="QString">localhost</value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
        <value type="QString"></value>
        <value type="QString"></value>
+       <value type="QString"></value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
-       <value type="QDateTime">2012-01-14T12:58:57</value>
+       <value type="QDateTime">2012-01-14T13:11:32</value>
+       <value type="QDateTime">2012-01-15T09:06:16</value>
        <value type="QDateTime">2012-01-01T15:35:35</value>
       </valuelist>
      </valuemap>

diff --git a/pirkeysetmanager.cpp b/pirkeysetmanager.cpp
index 1d99410..c8416a8 100644 (file)
--- a/pirkeysetmanager.cpp
+++ b/pirkeysetmanager.cpp
@@ -290,9 +290,10 @@ void PIRKeysetManager::populateKeyset(
 void PIRKeysetManager::populateGuiWidget(
   PIRSelectKeysetForm *skf)
 {
-  PIRKeysetCollection::const_iterator i = keysetsInfo.begin();
-
   PIRMakeName make;
+  PIRKeysetWidgetItem *kwi;
+
+  PIRKeysetCollection::const_iterator i = keysetsInfo.begin();
 
   while (i != keysetsInfo.end())
   {
@@ -300,7 +301,9 @@ void PIRKeysetManager::populateGuiWidget(
     QString tempString = makeManager.getMakeString(make);
     tempString.append(" ");
     tempString.append(i->second->getKeysetName());
-    skf->addNameToList(tempString, i->first, make);
+    kwi = new PIRKeysetWidgetItem(tempString, i->first, make);
+    i->second->populateDeviceTypes(kwi);
+    skf->addWidgetItem(kwi);
     ++i;
   }
 }

diff --git a/pirkeysetmetadata.cpp b/pirkeysetmetadata.cpp
index 1f6869e..cb8847c 100644 (file)
--- a/pirkeysetmetadata.cpp
+++ b/pirkeysetmetadata.cpp
@@ -1,5 +1,7 @@
 #include "pirkeysetmetadata.h"
 
+#include <iostream>
+
 PIRKeysetMetaData::PIRKeysetMetaData(
   const char *r,
   PIRMakeName m,

diff --git a/pirselectkeysetform.cpp b/pirselectkeysetform.cpp
index 37ff54c..e678686 100644 (file)
--- a/pirselectkeysetform.cpp
+++ b/pirselectkeysetform.cpp
@@ -58,6 +58,12 @@ void PIRSelectKeysetForm::addNameToList(
   ui->keysetListWidget->addItem(new PIRKeysetWidgetItem(name, index, make));
 }
 
+void PIRSelectKeysetForm::addWidgetItem(
+  PIRKeysetWidgetItem *kwi)
+{
+  ui->keysetListWidget->addItem(kwi);
+}
+
 QListWidget *PIRSelectKeysetForm::getKeysetListWidget()
 {
   return ui->keysetListWidget;

diff --git a/pirselectkeysetform.h b/pirselectkeysetform.h
index fd268ea..dfe8d90 100644 (file)
--- a/pirselectkeysetform.h
+++ b/pirselectkeysetform.h
@@ -7,6 +7,7 @@
 
 #include "pirmakenames.h"
 #include "pirdevicetypenames.h"
+#include "pirkeysetwidgetitem.h"
 
 namespace Ui {
 class PIRSelectKeysetForm;
@@ -25,6 +26,9 @@ public:
     unsigned int index,
     PIRMakeName make);
 
+  void addWidgetItem(
+    PIRKeysetWidgetItem *kwi);
+
   // This is a bit of a hack, but not sure how to create a connection otherwise.
   QListWidget *getKeysetListWidget();
 

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index b908410..9be09a3 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,5 +1,5 @@
-pierogi (0.0.1) unstable; urgency=low
+pierogi (0.1.0) unstable; urgency=low
 
   * Initial Release.
 
- -- John Pietrzak <jpietrzak8@gmail.com>  Mon, 02 Jan 2012 08:14:13 -0500
+ -- John Pietrzak <jpietrzak8@gmail.com>  Sat, 14 Jan 2012 01:30:00 -0500

diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules
index 5cac805..23e8a61 100755 (executable)
--- a/qtc_packaging/debian_fremantle/rules
+++ b/qtc_packaging/debian_fremantle/rules
@@ -82,7 +82,7 @@ binary-arch: build install
 #      dh_perl
 #      dh_makeshlibs
        dh_installdeb
-       # dh_shlibdeps # Uncomment this line for use without Qt Creator
+#      dh_shlibdeps # Uncomment this line for use without Qt Creator
        dh_gencontrol
        dh_md5sums
        dh_builddeb