Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 484ccab8e6e11a68506afc1f6b15a40e42a9e2a1..c42cc044fd2c8b5e3e9997ee1d852a0b530f62da 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,15 +20,20 @@
 
 #include "dolphinapplication.h"
 
 
 #include "dolphinapplication.h"
 

+#include "dolphinmainwindow.h"
+

 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>

+#include <kicon.h>

 #include <klocale.h>
 #include <klocale.h>

+#include <kmainwindow.h>
+#include <kdebug.h>

 
 int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
 
 int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),

-                     "0.9.1",
+                     "0.9.5",

                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
                      ki18nc("@info:credit", "(C) 2006, 2007 Peter Penz"));
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
                      ki18nc("@info:credit", "(C) 2006, 2007 Peter Penz"));


@@ -45,7 +50,7 @@ int main(int argc, char **argv)
                     "aseigo@kde.org");
     about.addAuthor(ki18nc("@info:credit", "Rafael Fernández López"),
                     ki18nc("@info:credit", "Developer"),
                     "aseigo@kde.org");
     about.addAuthor(ki18nc("@info:credit", "Rafael Fernández López"),
                     ki18nc("@info:credit", "Developer"),

-                    "ereslibre@gmail.com");
+                    "ereslibre@kde.org");

     about.addAuthor(ki18nc("@info:credit", "Kevin Ottens"),
                     ki18nc("@info:credit", "Developer"),
                     "ervin@kde.org");
     about.addAuthor(ki18nc("@info:credit", "Kevin Ottens"),
                     ki18nc("@info:credit", "Developer"),
                     "ervin@kde.org");


@@ -70,17 +75,26 @@ int main(int argc, char **argv)
     }
 
     DolphinApplication app;
     }
 
     DolphinApplication app;

-#ifdef __GNUC__
-#warning TODO, SessionManagement
-#endif
-#if 0
-    if (false /* KDE4-TODO: app.isSessionRestored() */) {
+    // the .desktop file is not taken into account when launching manually, so
+    // set the icon precautionally:
+    QApplication::setWindowIcon(KIcon("system-file-manager"));
+    KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
+
+    if (app.isSessionRestored()) {

         int n = 1;
         while (KMainWindow::canBeRestored(n)) {
         int n = 1;
         while (KMainWindow::canBeRestored(n)) {

-            Dolphin::mainWin().restore(n);
+            const QString className = KXmlGuiWindow::classNameOfToplevel(n);
+            if (className == QLatin1String("DolphinMainWindow")) {
+                DolphinMainWindow* win = app.createMainWindow();
+                win->restore(n);
+            } else {
+                kWarning() << "Unknown class " << className << " in session saved data!";
+            }

             ++n;
         }
     } else {
             ++n;
         }
     } else {

-#endif
-        return app.exec();
+        app.exec();

     }
     }

+
+    return 0;
+}