[PC-BSD Commits] r15796 - pcbsd-projects/EasyPBI

svn at pcbsd.org svn at pcbsd.org
Mon Mar 12 19:08:18 PDT 2012


Author: kenmoore
Date: 2012-03-13 02:08:17 +0000 (Tue, 13 Mar 2012)
New Revision: 15796

Modified:
   pcbsd-projects/EasyPBI/mainwindow.cpp
   pcbsd-projects/EasyPBI/mainwindow.h
   pcbsd-projects/EasyPBI/mainwindow.ui
   pcbsd-projects/EasyPBI/modBuild.cpp
Log:
Add the capability for EasyPBI to now edit pbi.conf files within modules, and it works quite well. Also add the beginnings of the resources editor as well as the tabs for desktop/menu entries and external-links editors to be filled in later.



Modified: pcbsd-projects/EasyPBI/mainwindow.cpp
===================================================================
--- pcbsd-projects/EasyPBI/mainwindow.cpp	2012-03-12 21:28:00 UTC (rev 15795)
+++ pcbsd-projects/EasyPBI/mainwindow.cpp	2012-03-13 02:08:17 UTC (rev 15796)
@@ -21,9 +21,15 @@
     ui->pushBuildPBI->setEnabled(FALSE);
     ui->pushFindIcon->setEnabled(FALSE);
     ui->pushSaveLog->setEnabled(FALSE);
+    ui->pushOpenPortInfo->setEnabled(FALSE);
+    ui->pushPackageModule->setEnabled(FALSE);
+    ui->tabModuleEditor->setEnabled(FALSE);
     ui->tabWidget->setCurrentIndex(0); //default to the Modules Tab
+    ui->tabModuleEditor->setCurrentIndex(0); //default to the pbi.conf editor
     connect(ui->pushResetModule,SIGNAL(clicked()),this,SLOT(Reset_Form()) );
-    
+    connect(ui->pushClearChanges,SIGNAL(clicked()),this,SLOT(editRefreshPbiConf()) );
+    connect(ui->pushSavePbiConf,SIGNAL(clicked()),this,SLOT(editSavePbiConf()) );
+    connect(ui->pushRefreshResources,SIGNAL(clicked()),this,SLOT(editRefreshResources()) );
     SetupDefaults();
 }
 
@@ -383,6 +389,8 @@
   ui->progressBar->update();
 }
 
+// -------- BUILD PBI'S -----------
+
 void MainWindow::on_pushChangeOutDir_clicked(){
   QString outDir_path; 
   outDir_path = QFileDialog::getExistingDirectory(this,tr("Select PBI Output Directory"),PROG_DIR+"/PBI");
@@ -556,4 +564,180 @@
   file->write(ui->buildOutputArea->toPlainText().toUtf8());
   file->close();
 }
+// ----------- EDIT PBI MODULES --------------
+void MainWindow::on_tabWidget_currentChanged(int index){
+  if(index ==2){ //if moving to the Module Editor Tab
+    //make sure there is not a mismatch between the selected module on this tab and the data saved in the module builder backend
+    ui->tabModuleEditor->setEnabled(FALSE); 
+    ui->pushOpenPortInfo->setEnabled(FALSE);
+    ui->pushPackageModule->setEnabled(FALSE);
+    ui->label_module_selected->setText(tr("No Module Selected"));
+  }
+}
 
+void MainWindow::on_tabModuleEditor_currentChanged(int index){
+  if(index == 1){ //Resources Tab
+    editRefreshResources();
+  }
+}
+
+void MainWindow::on_pushSelectModuleEdit_clicked(){
+  //Get the desired module
+  QString module_path;
+  module_path = QFileDialog::getExistingDirectory(this, tr("Select Module to Edit"), PROG_DIR+"/Modules");
+  if(module_path.isEmpty()){return;} //action cancelled or closed
+  //Update Backend structures
+  if( !ModBuild::loadPBIconf(module_path) ){
+    //Invalid Module Directory (no pbi.conf inside)
+    QMessageBox::warning(this,tr("Invalid PBI Module"),tr("You have selected an invalid PBI module, please make a different choice."));
+    return;
+  }
+  //Enable buttons and GUI display
+  ui->label_module_selected->setText(module_path);
+  ui->pushOpenPortInfo->setEnabled(TRUE);
+  ui->pushPackageModule->setEnabled(TRUE);
+  editRefreshPbiConf();
+  ui->tabModuleEditor->setEnabled(TRUE);
+}
+
+
+void MainWindow::on_pushOpenPortInfo_clicked(){
+   //Get the currently selected port within the module
+   QString currentmakeport = ModBuild::readValue("PBI_MAKEPORT");
+   //Open up the freshports.org page for the selected port
+   QString target_url = "http://freshports.org/" + currentmakeport;
+   QDesktopServices::openUrl(QUrl(target_url));
+}
+
+void MainWindow::on_pushPackageModule_clicked(){
+   //Get the current Module Directory
+   QString modDir = ui->label_module_selected->text();
+   //Call the function to compress the module directory
+   ModBuild::compressModule(modDir);
+   //Display location of the newly packaged module
+   QMessageBox::information(this,tr("Module Packaged"),tr("A copy of your module has been compressed as (module-name).tar.gz within the same directory as your PBI module."));
+}
+
+void MainWindow::editRefreshPbiConf(){
+  //Display the current PBI info in the backend
+  ui->newProgName->setText(ModBuild::readValue("PBI_PROGNAME"));
+  ui->newProgWeb->setText(ModBuild::readValue("PBI_PROGWEB"));
+  ui->newProgAuth->setText(ModBuild::readValue("PBI_PROGAUTHOR"));
+  ui->listNewProgIcon->clear();
+  QString progicon = ModBuild::getFilenameFromPath(ModBuild::readValue("PBI_PROGICON"));
+  QString progiconpath = ui->label_module_selected->text() +"/resources/"+progicon;
+  ui->listNewProgIcon->addItem(QIcon(progiconpath),progicon);
+  ui->listNewProgIcon->setCurrentIndex(0);
+  //Get all the .png files in the resources directory and add them to the list
+  QDir dir(ui->label_module_selected->text()+"/resources");
+  QFileInfoList iconlist = dir.entryInfoList(QStringList("*.png"));
+  for(int i=0;i<iconlist.length(); i++){
+    if(iconlist[i].fileName() != progicon){ui->listNewProgIcon->addItem(QIcon(iconlist[i].absoluteFilePath()),iconlist[i].fileName()); }
+  }
+  QStringList mkportbefore = ModBuild::readValue("PBI_MKPORTBEFORE").split(" ",QString::SkipEmptyParts);
+  ui->listMkPortBefore->clear();
+  ui->listMkPortBefore->addItems(mkportbefore);
+  QStringList mkportafter = ModBuild::readValue("PBI_MKPORTAFTER").split(" ",QString::SkipEmptyParts);
+  ui->listMkPortAfter->clear();
+  ui->listMkPortAfter->addItems(mkportafter);
+  ui->newMkOpts->setText(ModBuild::readValue("PBI_MAKEOPTS"));
+  if(ModBuild::readValue("PBI_REQUIRESROOT")=="NO"){ui->checkRequiresRoot->setChecked(FALSE); }
+  else{ui->checkRequiresRoot->setChecked(TRUE); }
+}
+
+void MainWindow::editSavePbiConf(){
+  //Save any changes into the backend structure
+  qDebug() << "Saving new pbi.conf information";
+  // -- edit boxes --
+  ModBuild::writeValue("PBI_PROGNAME",ui->newProgName->text());
+  ModBuild::writeValue("PBI_PROGWEB",ui->newProgWeb->text());
+  ModBuild::writeValue("PBI_PROGAUTHOR",ui->newProgAuth->text());
+  ModBuild::writeValue("PBI_MAKEOPTS",ui->newMkOpts->text());
+  // -- list boxes --
+  ModBuild::writeValue("PBI_PROGICON",ui->listNewProgIcon->currentText() );
+
+  QString mkportbefore;
+  for(int i=0; i<ui->listMkPortBefore->count(); i++){
+    mkportbefore.append(" "+ui->listMkPortBefore->itemText(i) );
+  }
+  ModBuild::writeValue("PBI_MKPORTBEFORE",mkportbefore);
+
+  QString mkportafter;
+  for(int i=0; i<ui->listMkPortAfter->count(); i++){
+    mkportafter.append(" "+ui->listMkPortAfter->itemText(i) );
+  }
+  ModBuild::writeValue("PBI_MKPORTAFTER",mkportafter);
+
+  // -- root permissions --
+  QString requiresroot = "NO";
+  if(ui->checkRequiresRoot->isChecked()){requiresroot="YES";}
+  ModBuild::writeValue("PBI_REQUIRESROOT",requiresroot);
+
+  //Write the new pbi.conf with the changes
+  QString modDir = ui->label_module_selected->text();
+  if( !ModBuild::writePBIconf(modDir) ){
+    //Error writing the new pbi.conf
+    QMessageBox::warning(this,tr("Write Error"),tr("The pbi.conf file in your module could not be overwritten, check the directory permissions and try again."));
+    //Return to the original backend values (re-read pbi.conf)
+    ModBuild::loadPBIconf(ui->label_module_selected->text());
+    //Do NOT clear the new configuration on the GUI!! (User will lose desired changes)
+    return;
+  }
+  //Update the GUI with the new configuration
+  editRefreshPbiConf();
+}
+
+void MainWindow::on_pushAddPortBefore_clicked(){
+  // check to see if the ports tree exists
+  if (!Check_For_Ports(true)){return;}
+
+  // get new port to add
+  QString newport = QFileDialog::getExistingDirectory(this, tr("Select Port"), PORTS_DIR);
+  if(newport.isEmpty()){return;} //action cancelled or closed
+
+  //Add the new port to the list
+  ui->listMkPortBefore->addItem(newport.section("ports/",1,1) );
+}
+
+void MainWindow::on_pushRemovePortBefore_clicked(){
+  //Remove the selected port from the list
+  ui->listMkPortBefore->removeItem(ui->listMkPortBefore->currentIndex());
+}
+
+void MainWindow::on_pushAddPortAfter_clicked(){
+  // check to see if the ports tree exists
+  if (!Check_For_Ports(true)){return;}
+
+  // get new port to add
+  QString newport = QFileDialog::getExistingDirectory(this, tr("Select Port"), PORTS_DIR);
+  if(newport.isEmpty()){return;} //action cancelled or closed
+
+  //Add the new port to the list
+  ui->listMkPortAfter->addItem(newport.section("ports/",1,1) );
+}
+
+void MainWindow::on_pushRemovePortAfter_clicked(){
+  //Remove the selected port from the list
+  ui->listMkPortAfter->removeItem(ui->listMkPortAfter->currentIndex());
+}
+
+void MainWindow::editRefreshResources(){
+  //Clear the GUI
+  ui->listCurrentResources->clear();
+  //Scan the resources directory for all the files inside
+  QDir dir(ui->label_module_selected->text()+"/resources");
+  QFileInfoList fileList = dir.entryInfoList();
+  //Display the files in the GUI
+  for(int i=0; i<fileList.length(); i++){
+    if( fileList[i].fileName().startsWith(".") ){
+      //do nothing for "." and ".." entries (and hidden files/folders)
+    }else if( fileList[i].isDir() ){
+      ui->listCurrentResources->addItem(fileList[i].fileName()); //Add a directory icon here later
+    }else if(fileList[i].fileName().endsWith(".png")){
+      QListWidgetItem *item = new QListWidgetItem( QIcon(fileList[i].absoluteFilePath()), fileList[i].fileName() );
+      ui->listCurrentResources->addItem(item);
+    }else{
+      ui->listCurrentResources->addItem(fileList[i].fileName());
+    }
+  }
+}

Modified: pcbsd-projects/EasyPBI/mainwindow.h
===================================================================
--- pcbsd-projects/EasyPBI/mainwindow.h	2012-03-12 21:28:00 UTC (rev 15795)
+++ pcbsd-projects/EasyPBI/mainwindow.h	2012-03-13 02:08:17 UTC (rev 15796)
@@ -60,7 +60,19 @@
     void killPBIBuild();
     void buildError(QProcess::ProcessError);
     void on_pushSaveLog_clicked();
-    
+    void on_pushSelectModuleEdit_clicked();
+    void on_pushOpenPortInfo_clicked();
+    void on_pushPackageModule_clicked();
+    void editRefreshPbiConf();
+    void editSavePbiConf();
+    void on_pushAddPortBefore_clicked();
+    void on_pushRemovePortBefore_clicked();
+    void on_pushAddPortAfter_clicked();
+    void on_pushRemovePortAfter_clicked();
+    void on_tabWidget_currentChanged(int);
+    void on_tabModuleEditor_currentChanged(int);
+    void editRefreshResources();
+
 private:
     Ui::MainWindow *ui;
     void SetupDefaults();

Modified: pcbsd-projects/EasyPBI/mainwindow.ui
===================================================================
--- pcbsd-projects/EasyPBI/mainwindow.ui	2012-03-12 21:28:00 UTC (rev 15795)
+++ pcbsd-projects/EasyPBI/mainwindow.ui	2012-03-13 02:08:17 UTC (rev 15796)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>555</width>
-    <height>398</height>
+    <width>543</width>
+    <height>405</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -22,7 +22,7 @@
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>0</number>
+       <number>2</number>
       </property>
       <widget class="QWidget" name="tabModules">
        <attribute name="title">
@@ -438,6 +438,378 @@
         </item>
        </layout>
       </widget>
+      <widget class="QWidget" name="tabEditor">
+       <attribute name="title">
+        <string>Module Editor</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="verticalLayout_5">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QPushButton" name="pushSelectModuleEdit">
+            <property name="text">
+             <string>Select Module</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_module_selected">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>No Module Selected</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <item>
+           <widget class="QPushButton" name="pushOpenPortInfo">
+            <property name="text">
+             <string>View Port Info</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushPackageModule">
+            <property name="text">
+             <string>Package Module</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QTabWidget" name="tabModuleEditor">
+          <property name="currentIndex">
+           <number>1</number>
+          </property>
+          <widget class="QWidget" name="tab">
+           <attribute name="title">
+            <string>pbi.conf</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_5">
+            <property name="sizeConstraint">
+             <enum>QLayout::SetDefaultConstraint</enum>
+            </property>
+            <item row="0" column="2" colspan="2">
+             <widget class="QLineEdit" name="newProgName">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_14">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Program Name</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_12">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Program Website</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_15">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Program Author</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_16">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Program Icon</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="0">
+             <widget class="QLabel" name="label_17">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Make Port Before</string>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="0">
+             <widget class="QLabel" name="label_18">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Make Port After</string>
+              </property>
+             </widget>
+            </item>
+            <item row="9" column="0">
+             <widget class="QLabel" name="label_19">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Make Options</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2" colspan="2">
+             <widget class="QLineEdit" name="newProgWeb">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="2" colspan="2">
+             <widget class="QLineEdit" name="newProgAuth">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item row="12" column="2">
+             <widget class="QPushButton" name="pushSavePbiConf">
+              <property name="text">
+               <string>Save </string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="1">
+             <widget class="QComboBox" name="listMkPortBefore">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="1">
+             <widget class="QComboBox" name="listMkPortAfter"/>
+            </item>
+            <item row="9" column="2" colspan="2">
+             <widget class="QLineEdit" name="newMkOpts">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="3">
+             <widget class="QPushButton" name="pushRemovePortAfter">
+              <property name="text">
+               <string>Remove Port</string>
+              </property>
+             </widget>
+            </item>
+            <item row="10" column="2" colspan="2">
+             <widget class="QCheckBox" name="checkRequiresRoot">
+              <property name="text">
+               <string>Require Root Permissions</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="2">
+             <widget class="QPushButton" name="pushAddPortBefore">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Add Port</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="3">
+             <widget class="QPushButton" name="pushRemovePortBefore">
+              <property name="text">
+               <string>Remove Port</string>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="2">
+             <widget class="QPushButton" name="pushAddPortAfter">
+              <property name="text">
+               <string>Add Port</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="2" colspan="2">
+             <widget class="QComboBox" name="listNewProgIcon"/>
+            </item>
+            <item row="12" column="3">
+             <widget class="QPushButton" name="pushClearChanges">
+              <property name="text">
+               <string>Reset</string>
+              </property>
+             </widget>
+            </item>
+            <item row="13" column="2">
+             <spacer name="verticalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="11" column="2" colspan="2">
+             <widget class="Line" name="line_5">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="tab_2">
+           <attribute name="title">
+            <string>Resources</string>
+           </attribute>
+           <layout class="QVBoxLayout" name="verticalLayout_6">
+            <item>
+             <widget class="QListWidget" name="listCurrentResources"/>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_3">
+              <item>
+               <widget class="QPushButton" name="pushAddResource">
+                <property name="text">
+                 <string>Add Resource</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pushRemoveResource">
+                <property name="text">
+                 <string>Remove Resource</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_4">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pushRefreshResources">
+                <property name="text">
+                 <string>Refresh</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="tab_3">
+           <attribute name="title">
+            <string>Desktop/Menu Entries</string>
+           </attribute>
+          </widget>
+          <widget class="QWidget" name="tab_4">
+           <attribute name="title">
+            <string>External-Links</string>
+           </attribute>
+          </widget>
+         </widget>
+        </item>
+       </layout>
+      </widget>
      </widget>
     </item>
    </layout>
@@ -448,8 +820,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>555</width>
-     <height>18</height>
+     <width>543</width>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

Modified: pcbsd-projects/EasyPBI/modBuild.cpp
===================================================================
--- pcbsd-projects/EasyPBI/modBuild.cpp	2012-03-12 21:28:00 UTC (rev 15795)
+++ pcbsd-projects/EasyPBI/modBuild.cpp	2012-03-13 02:08:17 UTC (rev 15796)
@@ -71,7 +71,7 @@
       //Pull apart the variable and the value
       QString var,val;
       var = line.section("=",0,0,QString::SectionSkipEmpty).trimmed();
-      val = line.section("=",1,1).section(";",0,0,QString::SectionSkipEmpty).trimmed().remove("\"");
+      val = line.section("=",1,50).section(";",0,0,QString::SectionSkipEmpty).trimmed().remove("\"");
       //might need to add check for values that cross multiple lines later (mkStructure entries especially)
       if(var=="PBI_PROGNAME"){ progStruct[0] = val; }
       else if(var=="PBI_PROGWEB"){ progStruct[1] = val; }
@@ -422,7 +422,7 @@
   //Check that the directory exists
   QDir testDir(modDir);
   if(testDir.exists() == FALSE){
-    qDebug() << "Error: Directory does not exist:" << modDir;
+    qDebug() << "Error: Module directory does not exist:" << modDir;
     return;
   }
   //Compress the directory



More information about the Commits mailing list