Changeset 84406a4

Timestamp:

Apr 24, 2013 4:21:11 PM (4 weeks ago)

Author:

Kris Moore <kris@…>

Branches:

master, 9.1-release

Children:

b4350b9

Parents:

d5d5aa1

Message:

Enable the basic / advanced view functionality

Save the last view mode, so we startup with it again

Fix a bug changing meta-pkgs, make sure we always refresh to be
positive whats on disk

Location:

src-qt4/pc-pkgmanager

Files:

• mainWin.cpp (modified) (5 diffs)
• mainWin.h (modified) (3 diffs)
• mainWin.ui (modified) (1 diff)

src-qt4/pc-pkgmanager/mainWin.cpp

@@ -21 +21 @@
 #include <pcbsd-utils.h>
 #include <pcbsd-ui.h>
+#include <QSettings>
 #include "mainWin.h"
 #include "../config.h"
@@ -36 +37 @@
   connect(buttonRescanPkgs, SIGNAL(clicked()), this, SLOT(slotRescanPkgsClicked()));
   connect(pushPkgApply, SIGNAL( clicked() ), this, SLOT( slotApplyClicked() ) );
+  connect(action_Quit, SIGNAL( triggered(bool) ), this, SLOT( slotCloseClicked() ) );
+  connect(action_Basic, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) );
+  connect(action_Advanced, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) );
+
+  // Setup the action group
+  viewGroup = new QActionGroup(this);
+  viewGroup->addAction(action_Basic);
+  viewGroup->addAction(action_Advanced);
+
+  treeMetaPkgs->setContextMenuPolicy(Qt::CustomContextMenu);
+  connect(treeMetaPkgs, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(slotMetaRightClick()) );
 
   QTimer::singleShot(200, this, SLOT(slotRescanPkgsClicked() ) );
+
+  QSettings settings("PC-BSD", "PackageManager");
+  QString curMode = settings.value("view/mode").toString();
+  if ( curMode == "Advanced" )
+  {
+    stackedPkgView->setCurrentIndex(1);
+    action_Basic->setChecked(false);
+    action_Advanced->setChecked(true);
+  }
+
+  initMetaWidget();
+}
+
+void mainWin::slotViewChanged()
+{
+  QString mode;
+  if ( action_Basic->isChecked() ) {
+    stackedPkgView->setCurrentIndex(0);
+    mode="Basic";
+  } else {
+    mode="Advanced";
+    stackedPkgView->setCurrentIndex(1);
+  }
+
+  // Save the mode as the default at next open
+  QSettings settings("PC-BSD", "PackageManager");
+  settings.setValue("view/mode", mode);
+
+  // Changed view, lets refresh
   initMetaWidget();
 }
@@ -48 +89 @@
 
 void mainWin::slotApplyClicked() {
+  // Running in basic mode
+  if ( stackedPkgView->currentIndex() == 0 )
+  {
+      saveMetaPkgs();   
+  } else {
+  // Running in advanced mode
+
+  }
 
 }
@@ -339 +388 @@
     QMessageBox::warning(this, tr("Finished!"), tr("Package changes complete!" ));
 
+  // Clear out the old commands
+  pkgCmdList.clear();
+
+  // Switch back to our main display
   stackedTop->setCurrentIndex(0);
+
+  // Re-init the meta-widget
+  initMetaWidget();
 
 }
@@ -351 +407 @@
   qDebug() << "Starting metaWidget...";
 
-  populateMetaPkgs();
-
-  // Connect our slots
-  treeMetaPkgs->setContextMenuPolicy(Qt::CustomContextMenu);
-  connect(treeMetaPkgs, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(slotMetaRightClick()) );
+  // Running in basic mode
+  if ( stackedPkgView->currentIndex() == 0 )
+  {
+    populateMetaPkgs();
+    // Connect our slots
+  } else {
+  // Running in advanced mode
+
+  }
+
 
 

src-qt4/pc-pkgmanager/mainWin.h

@@ -39 +39 @@
 
 private slots:
-    void slotCloseClicked();
     
     // Generic pkgng handlers
@@ -57 +56 @@
     void slotMetaRightClick();
     void slotMetaViewPkgs();
+
+    // UI Stuff
+    void slotViewChanged();
+    void slotCloseClicked();
 
 private:
@@ -113 +116 @@
     QMenu *popup;
     dialogInfo *dIB;
+    QActionGroup *viewGroup;
 
 signals:

src-qt4/pc-pkgmanager/mainWin.ui

@@ -67 +67 @@
                </item>
                <item row="0" column="0">
-                <widget class="QStackedWidget" name="stackedPkgMode">
+                <widget class="QStackedWidget" name="stackedPkgView">
                  <property name="currentIndex">
                   <number>0</number>