Changeset 45 in tspsg-svn

Timestamp:

Aug 2, 2009, 1:50:14 AM (15 years ago)

Author:

laleppa

Message:

+ Wait Cursor (a.k.a Hourglass) while application starts.
+ Open file, passed as command-line argument.

• Renamed all resources to have lowercase names.
• Application couldn't be built on Qt < 4.5, because it has no QTextDocumentWriter class. Made a workaround.

Location:

trunk

Files:

• resources/Settings.png (deleted)
• resources/Task.bmp (deleted)
• resources/about.bmp (moved) (moved from trunk/resources/About.bmp)
• resources/icon.ico (moved) (moved from trunk/resources/Icon.ico)
• resources/icon.png (moved) (moved from trunk/resources/Icon.png)
• resources/tspsg.qrc (modified) (1 diff)
• resources/tspsg.rc (modified) (2 diffs)
• src/main.cpp (modified) (2 diffs)
• src/mainwindow.cpp (modified) (5 diffs)
• src/version.h (modified) (2 diffs, 1 prop)

trunk/resources/tspsg.qrc

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/images" >
-        <file>About.bmp</file>
-        <file>Icon.png</file>
-        <file>Settings.png</file>
-        <file>Task.bmp</file>
+        <file>about.bmp</file>
+        <file>icon.png</file>
         <file>icons/button_cancel.png</file>
         <file>icons/button_ok.png</file>

trunk/resources/tspsg.rc

@@ -15 +15 @@
 
 // Main Icon
-IDI_APPICON     ICON    "Icon.ico"
+IDI_APPICON     ICON    "icon.ico"
 
 // Version Info
@@ -39 +39 @@
         BLOCK "000004b0"
         BEGIN
-            VALUE "Comments", BUILD_STATUS
+//            VALUE "Comments", BUILD_STATUS
             VALUE "CompanyName", "..::Lёppsville::.. Homes"
             VALUE "FileDescription", "TSPSG: TSP Solver and Generator"

trunk/src/main.cpp

@@ -27 +27 @@
                 #pragma message("WARNING: You are using Qt version < 4.5. Application will not support some non-critical features.")
         #elif (defined(__GNUC__) || defined(__MINGW32__))
-                #warning "WARNING: You are using Qt version < 4.5. Application will not support some non-critical features."
+                #warning WARNING: You are using Qt version < 4.5. Application will not support some non-critical features.
+        #else
+                #error You are using Qt version < 4.5. Application will not support some non-critical features. To continue, please, comment line 31 at main.cpp.
         #endif
 #endif
@@ -34 +36 @@
 {
 QApplication app(argc, argv);
+        app.setOverrideCursor(QCursor(Qt::WaitCursor));
         QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf8"));
         QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf8"));
         QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
-        app.setOrganizationName("..::Lёppsville::..");
-        app.setOrganizationDomain("www.leppsville.com");
+        app.setOrganizationName("..::Lёppsville::.. Homes");
+        app.setOrganizationDomain("l-homes.org");
         app.setApplicationName("TSPSG");
 MainWindow mainwindow;
         mainwindow.show();
+        app.restoreOverrideCursor();
         return app.exec();
 }

trunk/src/mainwindow.cpp

@@ -1 @@
-        /*
+/*
  *  TSPSG: TSP Solver and Generator
  *  Copyright (C) 2007-2009 Lёppa <contacts[at]oleksii[dot]name>
@@ -87 +87 @@
         connect(tspmodel,SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),this,SLOT(dataChanged()));
         connect(tspmodel,SIGNAL(layoutChanged()),this,SLOT(dataChanged()));
+        if (QCoreApplication::arguments().count() > 1) {
+                tspmodel->loadTask(QCoreApplication::arguments().at(1));
+                setWindowModified(false);
+        }
 #ifdef Q_OS_WINCE
         taskView->resizeColumnsToContents();
@@ -229 +233 @@
         sd.setAcceptMode(QFileDialog::AcceptSave);
 QStringList filters(trUtf8("HTML Files") + " (*.html *.htm)");
+#if QT_VERSION >= 0x040500
         filters.append(trUtf8("OpenDocument Files") + " (*.odt)");
+#endif // QT_VERSION >= 0x040500
         filters.append(trUtf8("All Files") + " (*)");
         sd.setNameFilters(filters);
@@ -239 +245 @@
                 return;
         selectedFile = files.first();
+#if QT_VERSION >= 0x040500
 QTextDocumentWriter dw(selectedFile);
         if (!(selectedFile.endsWith(".htm",Qt::CaseInsensitive) || selectedFile.endsWith(".html",Qt::CaseInsensitive) || selectedFile.endsWith(".odt",Qt::CaseInsensitive) || selectedFile.endsWith(".txt",Qt::CaseInsensitive)))
                 dw.setFormat("plaintext");
         dw.write(solutionText->document());
+#else
+        // Qt < 4.5 has no QTextDocumentWriter class
+QFile file(selectedFile);
+        if (!file.open(QFile::WriteOnly))
+                return;
+QTextStream ts(&file);
+        ts.setCodec(QTextCodec::codecForName("UTF-8"));
+        ts << solutionText->document()->toHtml("UTF-8");
+#endif // QT_VERSION >= 0x040500
 }
 
@@ -388 +404 @@
         // TODO: Normal about window :-)
 QString about = QString::fromUtf8("TSPSG - TSP Solver and Generator\n");
-        about += QString::fromUtf8("    Version: "BUILD_VERSION" ("BUILD_STATUS")\n");
+        about += QString::fromUtf8("    Version: "BUILD_VERSION"\n");
         about += QString::fromUtf8("    Copyright (C) 2007-%1 Lёppa <contacts[at]oleksii[dot]name>\n").arg(QDate::currentDate().toString("yyyy"));
         about += QString::fromUtf8("Target OS: %1\n").arg(OS);

trunk/src/version.h

@@ -27 +27 @@
 #define BUILD_VERSION_MAJOR 0
 #define BUILD_VERSION_MINOR 1
-#define BUILD_RELEASE 1
-// Will stick this to revision
-#define BUILD_NUMBER 42
-#define BUILD_STATUS "alpha 1"
+#define BUILD_RELEASE 2
+// This will only change on releases and will be the same as revision number
+#define BUILD_NUMBER 65535
+// Release number meanings:
+//   1  --  3: alpha 1 to 3
+//   4  --  7: beta 1 to 4
+//   8  -- 10: rc 1 to 3
+//   11 --...: release 1 to ...
+#if BUILD_NUMBER == 65535
+        #define BUILD_STATUS (dev build)
+#elif BUILD_RELEASE < 4
+        #define BUILD_STATUS (alpha)
+#elif BUILD_RELEASE < 8
+        #define BUILD_STATUS (beta)
+#elif BUILD_RELEASE < 11
+        #define BUILD_STATUS (rc)
+#endif // BUILD_NUMBER == 65535
 
 // "Converting" number to string
@@ -36 +49 @@
 #define QUOTE(x) QUOTE_X(x)
 
-#define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE)
+#ifndef BUILD_STATUS
+        #define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE)
+#else
+        #define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE BUILD_STATUS)
+#endif
 
 #endif // VERSION_H