Changeset 3525

Timestamp:

05/25/03 23:44:26 (5 years ago)

Author:

dreamforce2

Message:

- fix bug 720836, sort by alias mixed up online and offline users with non-threaded view.
- "save settings" now saves the column and order for sorting, qt-gui restores these settings on startup.

Location:

trunk/qt-gui/src

Files:

• mainwin.cpp (modified) (2 diffs)
• mainwin.h (modified) (2 diffs)
• userbox.cpp (modified) (3 diffs)
• userbox.h (modified) (1 diff)

trunk/qt-gui/src/mainwin.cpp

@@ -342 +342 @@
   licqConf.ReadBool("ShowDividers", m_bShowDividers, true);
   licqConf.ReadNum("SortByStatus", m_nSortByStatus, 1);
+  licqConf.ReadNum("SortColumn", m_nSortColumn, 0);
+  licqConf.ReadBool("SortColumnAscending", m_bSortColumnAscending, true);
   licqConf.ReadBool("ShowGroupIfNoMsg", m_bShowGroupIfNoMsg, true);
   licqConf.ReadBool("BoldOnMsg", m_bBoldOnMsg, true);
@@ -3008 +3010 @@
   licqConf.WriteBool("ShowDividers", m_bShowDividers);
   licqConf.WriteNum("SortByStatus", m_nSortByStatus);
+  licqConf.WriteNum("SortColumn", m_nSortColumn);
+  licqConf.WriteBool("SortColumnAscending", m_bSortColumnAscending);
   licqConf.WriteBool("ShowGroupIfNoMsg", m_bShowGroupIfNoMsg);
   licqConf.WriteBool("UseThreadView", m_bThreadView);

trunk/qt-gui/src/mainwin.h

@@ -135 +135 @@
        m_bPopIdleTime,
        m_bShowAllEncodings,
-       m_bTabbedChatting;
+       m_bTabbedChatting,
+       m_bSortColumnAscending;
 
   QString m_MsgAutopopupKey;
@@ -145 +146 @@
 
   unsigned long m_nCurrentGroup, m_nGroupStates;
-  unsigned short m_nSortByStatus;
+  unsigned short m_nSortByStatus,
+                 m_nSortColumn;
   GroupType m_nGroupType;
   QString usprintfHelp;

trunk/qt-gui/src/userbox.cpp

@@ -795 +795 @@
     return (m_sPrefix + m_sSortKey + text(1).lower());
   else
-    return(QListViewItem::key(column, ascending).lower());
+    return (m_sPrefix + QListViewItem::key(column, ascending).lower());
 }
 
@@ -835 +835 @@
   setAllColumnsShowFocus(true);
   setTreeStepSize(0);
-  setSorting(0);
+  setSorting(gMainWindow->m_nSortColumn, gMainWindow->m_bSortColumnAscending);
   setVScrollBarMode(gMainWindow->m_bScrollBar ? Auto : AlwaysOff);
 
@@ -1584 +1584 @@
   }
 }
+
+void CUserView::setSorting( int column, bool ascending)
+{
+  gMainWindow->m_nSortColumn = column;
+  gMainWindow->m_bSortColumnAscending = ascending;
+  QListView::setSorting( column, ascending );
+}

trunk/qt-gui/src/userbox.h

@@ -149 +149 @@
 #endif
   static void UpdateFloaties();
+  virtual void setSorting( int column, bool ascending = true);
 
 protected: