[PlaneShift-svn] SF.net SVN: planeshift:[9249] trunk

[<ral...@us...>]

Revision: 9249
          http://sourceforge.net/p/planeshift/code/9249
Author:   ralphcampbell
Date:     2014-02-06 06:53:28 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
Sort the modifier lists.

Modified Paths:
--------------
    trunk/data/gui/modswindow.xml
    trunk/src/client/gui/pawsmodswindow.cpp
    trunk/src/client/gui/pawsmodswindow.h

Modified: trunk/data/gui/modswindow.xml
===================================================================
--- trunk/data/gui/modswindow.xml	2014-02-06 01:29:12 UTC (rev 9248)
+++ trunk/data/gui/modswindow.xml	2014-02-06 06:53:28 UTC (rev 9249)
@@ -10,7 +10,7 @@
     <widget name="adjectiveList" factory="pawsListBox"  >
         <frame x="8" y="5" width="100" height="250" border="no" />
 
-        <columns height="16">
+        <columns height="16" sortBy="0" sortOrder="asc">
             <column width="250" >
                 <widget name="Adjective" factory="pawsTextBox">
                 <text align="CENTRE" />
@@ -23,7 +23,7 @@
     <widget name="prefixList" factory="pawsListBox"  >
         <frame x="124" y="5" width="100" height="250" border="no" />
 
-        <columns height="16">
+        <columns height="16" sortBy="0" sortOrder="asc">
             <column width="250" >
                 <widget name="Prefix" factory="pawsTextBox">
                 <text align="CENTRE" />
@@ -36,7 +36,7 @@
     <widget name="suffixList" factory="pawsListBox"  >
         <frame x="240" y="5" width="100" height="250" border="no" />
 
-        <columns height="16">
+        <columns height="16" sortBy="0" sortOrder="asc">
             <column width="250" >
                 <widget name="Suffix" factory="pawsTextBox">
                 <text align="CENTRE" />

Modified: trunk/src/client/gui/pawsmodswindow.cpp
===================================================================
--- trunk/src/client/gui/pawsmodswindow.cpp	2014-02-06 01:29:12 UTC (rev 9248)
+++ trunk/src/client/gui/pawsmodswindow.cpp	2014-02-06 06:53:28 UTC (rev 9249)
@@ -84,6 +84,10 @@
         tb->SetName(name);
     }
 
+    list[psGMSpawnMods::ITEM_PREFIX]->SortRows();
+    list[psGMSpawnMods::ITEM_SUFFIX]->SortRows();
+    list[psGMSpawnMods::ITEM_ADJECTIVE]->SortRows();
+
     Show();
 }
 
@@ -139,3 +143,11 @@
     }
 #endif
 }
+
+void pawsModsWindow::Show()
+{
+    selectedRow[psGMSpawnMods::ITEM_PREFIX] = -1;
+    selectedRow[psGMSpawnMods::ITEM_SUFFIX] = -1;
+    selectedRow[psGMSpawnMods::ITEM_ADJECTIVE] = -1;
+    pawsWidget::Show();
+}

Modified: trunk/src/client/gui/pawsmodswindow.h
===================================================================
--- trunk/src/client/gui/pawsmodswindow.h	2014-02-06 01:29:12 UTC (rev 9248)
+++ trunk/src/client/gui/pawsmodswindow.h	2014-02-06 06:53:28 UTC (rev 9249)
@@ -41,6 +41,8 @@
 
     void OnListAction(pawsListBox* widget, int status);
 
+    void Show();
+
 private:
     pawsListBox* list[psGMSpawnMods::ITEM_NUM_TYPES];
     int selectedRow[psGMSpawnMods::ITEM_NUM_TYPES];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.