pidgin/quail/quail-redux

Add saving and restoring the position and state

2013-09-21, Phil Hannent
2a23fb10576a
Parents 4d501b99d544
Children 3105e8a45d1d
Add saving and restoring the position and state
3 files changed, 18 insertions(+), 15 deletions(-)
  • +3 -2
    src/QuailBuddyList.cpp
  • +14 -12
    src/QuailMainWindow.cpp
  • +1 -1
    src/main.cpp
    • --- a/src/QuailBuddyList.cpp Sat Sep 21 09:07:28 2013 +0100
    +++ b/src/QuailBuddyList.cpp Sat Sep 21 09:20:52 2013 +0100
    @@ -34,6 +34,7 @@
    #include <QDebug>
    #include <QHeaderView>
    #include <QMenu>
    +#include <QSettings>
    #include <QTimer>
    #define BUDDY_ICON_SIZE 20
    @@ -652,9 +653,9 @@
    void
    QQuailBuddyList::saveBlistSlot()
    {
    - QSetting appSettings(APP_NAME, APP_MAJOR_VERSION);
    + QSettings appSettings(APP_NAME, APP_MAJOR_VERSION);
    appSettings.setValue("geometry", saveGeometry());
    - appSettings.setValue("state", saveState());
    + //appSettings.setValue("state", saveState());
    }
    //TODO: This needs moving to the items contextMenuEvent
    --- a/src/QuailMainWindow.cpp Sat Sep 21 09:07:28 2013 +0100
    +++ b/src/QuailMainWindow.cpp Sat Sep 21 09:20:52 2013 +0100
    @@ -31,12 +31,13 @@
    #include <QHBoxLayout>
    #include <QLabel>
    #include <QMenu>
    +#include <QSettings>
    #include <QStackedWidget>
    #include <QSystemTrayIcon>
    #include <QTimer>
    +#include <QToolBar>
    #include <QVariant>
    #include <QVBoxLayout>
    -#include <QToolBar>
    #include <libpurple/prefs.h>
    #include <libpurple/conversation.h>
    @@ -74,8 +75,8 @@
    purple_prefs_add_bool("/quail/blist/show_large_icons",
    (QApplication::desktop()->screenGeometry().width() >= 600));
    purple_prefs_add_bool("/quail/blist/dim_idle_buddies", true);
    - purple_prefs_add_none("/quail/blist/geometary", 0);
    - purple_prefs_add_none("/quail/blist/state", 0);
    + //purple_prefs_add_none("/quail/blist/geometary", 0);
    + //purple_prefs_add_none("/quail/blist/state", 0);
    qQuailNotifyInit();
    }
    @@ -464,7 +465,7 @@
    void
    QQuailMainWindow::slotSaveSettings()
    {
    - QSetting appSettings(APP_NAME, APP_MAJOR_VERSION);
    + QSettings appSettings(APP_NAME, APP_MAJOR_VERSION);
    appSettings.setValue("geometry", saveGeometry());
    appSettings.setValue("state", saveState());
    }
    @@ -472,9 +473,9 @@
    void
    QQuailMainWindow::slotReadSettings()
    {
    - QSetting appSettings(APP_NAME, APP_MAJOR_VERSION);
    - restoreGeometry(appSettings.value("geometry", saveGeometry()));
    - restoreState(appSettings.value("state", saveState()));
    + QSettings appSettings(APP_NAME, APP_MAJOR_VERSION);
    + restoreGeometry(appSettings.value("geometry", saveGeometry()).toByteArray());
    + restoreState(appSettings.value("state", saveState()).toByteArray());
    }
    QQuailBListWindow *
    @@ -569,11 +570,12 @@
    qDebug() << "QQuailMainWindow::showPrefWindow().end";
    }
    -QQuailMainWindow::saveSettings()
    -{
    - saveGeometry();
    - saveState();
    -}
    +//void
    +//QQuailMainWindow::saveSettings()
    +//{
    +// saveGeometry();
    +// saveState();
    +//}
    QQuailMainWindow *
    qQuailGetMainWindow()
    --- a/src/main.cpp Sat Sep 21 09:07:28 2013 +0100
    +++ b/src/main.cpp Sat Sep 21 09:20:52 2013 +0100
    @@ -35,7 +35,7 @@
    QuailEventDispatcherWinGlib quailEventLoop;
    #endif
    //QuailEventDispatcherMarkTwo mainEvent;
    - QCoreApplication a(argc, argv);
    + QApplication a(argc, argv);
    qDebug() << "q";
    QQuailMainWindow w;
    qDebug() << "q2";