Initial version for a column view support (thanks a lot to Benjamin Meyer for QColumn...

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 00e6aeb99dd268dcbb3563419a0a90a6a8acb469..b0843a5e7a6206022fa535e37a92b5bf8c980b59 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,19 +15,18 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "dolphin.h"
-#include <kapplication.h>
+#include "dolphinapplication.h"
+
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <krun.h>
 
 static KCmdLineOptions options[] =
 {
-    { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
+    { "+[Url]", I18N_NOOP( "Document to open" ), 0 },
     KCmdLineLastOption
 };
 
@@ -35,7 +34,7 @@ int main(int argc, char **argv)
 {
     KAboutData about("dolphin",
                      I18N_NOOP("Dolphin"),
-                     "0.8.0",
+                     "0.9.0",
                      I18N_NOOP("File Manager"),
                      KAboutData::License_GPL,
                      "(C) 2006 Peter Penz");
@@ -54,28 +53,22 @@ int main(int argc, char **argv)
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
-
-    Dolphin& mainWin = Dolphin::mainWin();
-    mainWin.show();
+    if (!DolphinApplication::start()) {
+        return 0;
+    }
 
-    if (false /* KDE4-TODO: app.isRestored() */) {
+    DolphinApplication app;
+#ifdef __GNUC__
+#warning TODO, SessionManagement
+#endif
+#if 0
+    if (false /* KDE4-TODO: app.isSessionRestored() */) {
         int n = 1;
         while (KMainWindow::canBeRestored(n)){
             Dolphin::mainWin().restore(n);
             ++n;
         }
     } else {
-        KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-        if (args->count() > 0) {
-            mainWin.activeView()->setURL(args->url(0));
-
-            for (int i = 1; i < args->count(); ++i) {
-                KRun::run("dolphin", args->url(i));
-            }
-        }
-        args->clear();
-    }
-
+#endif
     return app.exec();
 }