Changed version setting.

RazrFalcon · Apr 2, 2012 · bcc8b1e · bcc8b1e
1 parent f9e846f
commit bcc8b1e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
@@ -4,5 +4,6 @@ AboutDialog::AboutDialog(QWidget *parent) :
  QDialog(parent)
 {
  setupUi(this);
+ lblTitle->setText("SVG Cleaner "+QApplication::applicationVersion());
  tabWidget->setCurrentIndex(0); // show always first tab
 }
diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui
@@ -15,7 +15,7 @@
  </property>
  <layout class="QVBoxLayout" name="verticalLayout">
  <item>
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="lblTitle">
  <property name="sizePolicy">
  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
  <horstretch>0</horstretch>
@@ -28,7 +28,7 @@
  </font>
  </property>
  <property name="text">
- <string notr="true">SVG Cleaner 0.5</string>
+ <string notr="true">SVG Cleaner</string>
  </property>
  <property name="alignment">
  <set>Qt::AlignCenter</set>

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,7 +1,6 @@
 #include <QtCore/QLibraryInfo>
 #include <QtCore/QTextCodec>
 #include <QtCore/QTranslator>
-
 #include <QtGui/QApplication>
 
 #include <QtDebug>
@@ -12,6 +11,7 @@
 int main(int argc, char *argv[])
 {
  QApplication app(argc, argv);
+ app.setApplicationVersion("0.5");
 
  QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
  QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
@@ -20,7 +20,8 @@ int main(int argc, char *argv[])
  // load translation for SVG Cleaner
  QString locale = QLocale::system().name();
 #ifdef Q_OS_WIN
- app.addLibraryPath("./translations");
+ app.addLibraryPath(QDir::toNativeSeparators(QApplication::applicationDirPath() + "/translations"))
+// app.addLibraryPath("./translations");
 #else
  app.addLibraryPath("/usr/share/svgcleaner/translations");
 #endif

diff --git a/svgcleaner.pro b/svgcleaner.pro
@@ -1,6 +1,5 @@
 QT += core gui svg
 TEMPLATE = app
-VERSION = 0.5
 unix:TARGET = svgcleaner-gui
 windows:TARGET = SVGCleaner
 
@@ -39,7 +38,7 @@ windows:RC_FILE = icons/icon.rc
 
 include(translations/translations.pri)
 
-unix {
+unix { # // FIXME move to .pri
  isEmpty (PREFIX):PREFIX = /usr
 
  INSTALLS += target desktop logo script presets interface translations