[PC-BSD Commits] r20360 - users/ken/EasyPBI2

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-12-03 21:37:33 +0000 (Mon, 03 Dec 2012)
New Revision: 20360

Added:
   users/ken/EasyPBI2/HISTORY.txt
   users/ken/EasyPBI2/LICENSE
   users/ken/EasyPBI2/aboutDialog.cpp
   users/ken/EasyPBI2/aboutDialog.h
   users/ken/EasyPBI2/aboutDialog.ui
Removed:
   users/ken/EasyPBI2/LICENSE
Modified:
   users/ken/EasyPBI2/EasyPBI.pro
   users/ken/EasyPBI2/EasyPBI.qrc
   users/ken/EasyPBI2/mainGUI.cpp
   users/ken/EasyPBI2/mainGUI.h
   users/ken/EasyPBI2/mainGUI.ui
   users/ken/EasyPBI2/newModuleDialog.cpp
Log:
Add in the "About EasyPBI" dialog and get it completely working. Also fix a couple bugs with making new modules from ports.



Modified: users/ken/EasyPBI2/EasyPBI.pro
===================================================================
--- users/ken/EasyPBI2/EasyPBI.pro	2012-12-03 18:59:02 UTC (rev 20359)
+++ users/ken/EasyPBI2/EasyPBI.pro	2012-12-03 21:37:33 UTC (rev 20360)
@@ -18,18 +18,21 @@
 	backend.cpp \
 	newModuleDialog.cpp \
 	config.cpp \
-	preferencesDialog.cpp
+	preferencesDialog.cpp \
+	aboutDialog.cpp
 
 HEADERS  += mainGUI.h \
             modBuild.h \
 	    backend.h \
 	    newModuleDialog.h \
 	    config.h \
-	    preferencesDialog.h
+	    preferencesDialog.h \
+	    aboutDialog.h
 
 FORMS    += mainGUI.ui \
 	    newModuleDialog.ui \
-	    preferencesDialog.ui
+	    preferencesDialog.ui \
+	    aboutDialog.ui
 
 RESOURCES+= EasyPBI.qrc
 

Modified: users/ken/EasyPBI2/EasyPBI.qrc
===================================================================
--- users/ken/EasyPBI2/EasyPBI.qrc	2012-12-03 18:59:02 UTC (rev 20359)
+++ users/ken/EasyPBI2/EasyPBI.qrc	2012-12-03 21:37:33 UTC (rev 20360)
@@ -6,4 +6,8 @@
     <file>icons/defaulticon.png</file>
     <file>icons/EasyPBIicon.png</file>
   </qresource>
+  <qresource prefix="files">
+    <file>HISTORY.txt</file>
+    <file>LICENSE</file>
+  </qresource>
 </RCC>

Index: users/ken/EasyPBI2/aboutDialog.ui
===================================================================
--- users/ken/EasyPBI2/aboutDialog.ui	2012-12-03 18:59:02 UTC (rev 20359)
+++ users/ken/EasyPBI2/aboutDialog.ui	2012-12-03 21:37:33 UTC (rev 20360)

Property changes on: users/ken/EasyPBI2/aboutDialog.ui
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
Modified: users/ken/EasyPBI2/mainGUI.cpp
===================================================================
--- users/ken/EasyPBI2/mainGUI.cpp	2012-12-03 18:59:02 UTC (rev 20359)
+++ users/ken/EasyPBI2/mainGUI.cpp	2012-12-03 21:37:33 UTC (rev 20360)
@@ -4,6 +4,7 @@
 #include "backend.h"
 #include "newModuleDialog.h"
 #include "preferencesDialog.h"
+#include "aboutDialog.h"
 
 MainGUI::MainGUI(QWidget *parent) :
     QMainWindow(parent),
@@ -382,18 +383,12 @@
    QDesktopServices::openUrl(QUrl(target_url));
 }
 
-void MainGUI::on_actionSummary_triggered(){
-  qDebug() << "Summary not implemented yet";
+void MainGUI::on_actionAbout_EasyPBI_triggered(){
+  aboutDialog dlg(this,settings->value("version"));
+  dlg.exec();
 }
 
-void MainGUI::on_actionLicense_triggered(){
-  qDebug() << "License not implemented yet";
-}
 
-void MainGUI::on_actionHistory_triggered(){
-  qDebug() << "History not implemented yet";
-}
-
 /*----------------------------------
    TOOLBAR OPTIONS
   -----------------------------------
@@ -431,6 +426,7 @@
 	  currentModule->writeValue("progname", currentModule->readValue("portname"));
 	  currentModule->writeValue("progweb", currentModule->readValue("portwebsite"));
 	  currentModule->writeValue("progauthor", currentModule->readValue("portauthor"));
+	  currentModule->writePBIconf();
 	}
       }else if(currentModule->isLocalPBI){
 	radio_module_local->toggle();

Modified: users/ken/EasyPBI2/mainGUI.h
===================================================================
--- users/ken/EasyPBI2/mainGUI.h	2012-12-03 18:59:02 UTC (rev 20359)
+++ users/ken/EasyPBI2/mainGUI.h	2012-12-03 21:37:33 UTC (rev 20360)
@@ -45,9 +45,7 @@
     void on_actionPackage_Module_triggered();
     void on_actionFreeBSD_Ports_triggered();
     void on_actionPBI_Modules_triggered();
-    void on_actionSummary_triggered();
-    void on_actionLicense_triggered();
-    void on_actionHistory_triggered();
+    void on_actionAbout_EasyPBI_triggered();
     //editor functions
     void slotModTabChanged(int);
     //pbi.conf functions

Modified: users/ken/EasyPBI2/mainGUI.ui
===================================================================
(Binary files differ)

Modified: users/ken/EasyPBI2/newModuleDialog.cpp
===================================================================
--- users/ken/EasyPBI2/newModuleDialog.cpp	2012-12-03 18:59:02 UTC (rev 20359)
+++ users/ken/EasyPBI2/newModuleDialog.cpp	2012-12-03 21:37:33 UTC (rev 20360)
@@ -100,4 +100,4 @@
 
 void NewModuleDialog::setDefaultIconFile(QString icon){
   ui->line_icon->setPlaceholderText(icon);
-}
\ No newline at end of file
+}