Merge branch 'master' of github.com:pcbsd/pcbsd

trueos · Jun 4, 2013 · 66f9603 · 66f9603
2 parents c9e754c + 4be6e6e
commit 66f9603
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src-qt4/EasyPBI/newModuleDialog.cpp b/src-qt4/EasyPBI/newModuleDialog.cpp
@@ -1,5 +1,6 @@
 #include "newModuleDialog.h"
 #include "ui_newModuleDialog.h"
+#include <QDir>
 #include <QDebug>
 
 NewModuleDialog::NewModuleDialog(QWidget *parent, QString portsDir) :
@@ -34,12 +35,12 @@ void NewModuleDialog::on_buttonBox_accepted(){
     moduleData = ui->line_port->text();
   }else if(ui->radio_local->isChecked() ){
     moduleType="local";
-    moduleData = ui->line_sources->text();
+    moduleData = ui->line_sources->text().replace("~",QDir::homePath());
   }else{
     moduleType.clear(); moduleData.clear();
   }
-  moduleIcon = ui->line_icon->text();
-  if(moduleIcon.isEmpty()){ moduleIcon = ui->line_icon->placeholderText(); }
+  moduleIcon = ui->line_icon->text().replace("~",QDir::homePath());
+  if(moduleIcon.isEmpty()){ moduleIcon = ui->line_icon->placeholderText().replace("~",QDir::homePath()); }
   //Now close the UI
   this->close();
 }
@@ -85,7 +86,7 @@ void NewModuleDialog::on_push_sources_clicked(){
   QString Sel = QFileDialog::getExistingDirectory(this, tr("Select Package Directory"), QDir::homePath());
   if(Sel.isEmpty()){return;} //action cancelled or closed	
   else{
-    ui->line_sources->setText(Sel);
+    ui->line_sources->setText(Sel.replace(QDir::homePath(),"~"));
   }
 }
 
@@ -99,5 +100,5 @@ void NewModuleDialog::on_push_icon_clicked(){
 }
 
 void NewModuleDialog::setDefaultIconFile(QString icon){
-  ui->line_icon->setPlaceholderText(icon);
+  ui->line_icon->setPlaceholderText(icon.replace(QDir::homePath(),"~"));
 }
diff --git a/src-qt4/libpcbsd/ui/i18n/libpcbsd_el.ts b/src-qt4/libpcbsd/ui/i18n/libpcbsd_el.ts
@@ -5,8 +5,7 @@
         <name>dialogInfoBox</name>
         <message>
             <source>Dialog</source>
-            <translation type="unfinished">
-            </translation>
+            <translation>Διάλογος            </translation>
         </message>
         <message>
             <source>&amp;Close</source>
@@ -18,8 +17,7 @@
         <name>dialogMetaProgress</name>
         <message>
             <source>System-Packages</source>
-            <translation type="unfinished">
-            </translation>
+            <translation>Πακέτα συστήματος</translation>
         </message>
         <message>
             <source>Total Progress</source>

diff --git a/src-qt4/pc-firstbootgui/i18n/FirstBoot_el.ts b/src-qt4/pc-firstbootgui/i18n/FirstBoot_el.ts
@@ -60,8 +60,7 @@
         </message>
         <message>
             <source>Name</source>
-            <translation type="unfinished">
-            </translation>
+            <translation>Όνομα</translation>
         </message>
         <message>
             <source>Username</source>