[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegames/ktuberling
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-10-27 14:37:06
[Download RAW message or body]

CVS commit by waba: 

One showstopper less:
Tuberling files can now be opened from konqueror.


  A            x-tuberling.desktop   1.1
  M +3 -0      Makefile.am   1.34
  M +1 -1      ktuberling.desktop   1.228
  M +11 -1     main.cpp   1.34
  M +8 -3      toplevel.cpp   1.60
  M +2 -0      toplevel.h   1.24


--- kdegames/ktuberling/Makefile.am  #1.33:1.34
@@ -27,4 +27,7 @@
 xdg_apps_DATA = ktuberling.desktop
 
+mimetypeapplicationdata_DATA = x-tuberling.desktop
+mimetypeapplicationdatadir = $(kde_mimedir)/application
+
 appsrc_DATA = ktuberlingui.rc
 appsrcdir = $(kde_datadir)/ktuberling

--- kdegames/ktuberling/ktuberling.desktop  #1.227:1.228
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=ktuberling %i %m -caption "%c"
+Exec=ktuberling %i %m -caption "%c" %u
 Name=Potato Guy
 Name[af]=Aartappel Man

--- kdegames/ktuberling/main.cpp  #1.33:1.34
@@ -13,9 +13,15 @@
 #include "toplevel.h"
 
+static KCmdLineOptions options[] = {
+   { "+<tuberling-file>", I18N_NOOP("Potato to open."), 0 },
+   KCmdLineLastOption
+};
+                  
+
 
 static const char *description = I18N_NOOP("Potato game for kids");
 static const char *text = I18N_NOOP("A program by Eric Bischoff \
<e.bischoff@noos.fr>\nand John Calhoun.\n\nThis program is dedicated to my daughter \
Sunniva.");  
-static const char *version = "0.3.3";
+static const char *version = "0.4";
 
 // Main function
@@ -32,4 +38,5 @@ int main(int argc, char *argv[])
   aboutData.addCredit("Roger Larsson", I18N_NOOP("Sounds tuning"), \
"roger.larsson@norran.net");  KCmdLineArgs::init(argc, argv, &aboutData);
+  KCmdLineArgs::addCmdLineOptions(options);
 
   KApplication app;
@@ -44,4 +51,7 @@ int main(int argc, char *argv[])
     toplevel = new TopLevel();
     toplevel->show();
+    KCmdLineArgs *args  = KCmdLineArgs::parsedArgs();
+    if (args->count())
+       toplevel->open(args->url(0));
   }
 

--- kdegames/ktuberling/toplevel.cpp  #1.59:1.60
@@ -289,6 +289,4 @@ void TopLevel::fileNew()
 void TopLevel::fileOpen()
 {
-  QString name;
-
   QString dir = locate("data", "ktuberling/museum/miss.tuberling");
   dir.truncate(dir.findRev('/') + 1);
@@ -296,8 +294,15 @@ void TopLevel::fileOpen()
   KURL url = KFileDialog::getOpenURL(dir, "*.tuberling");
 
+  open(url);
+}
+
+void TopLevel::open(const KURL &url)
+{
   if (url.isEmpty())
     return;
 
-  KIO::NetAccess::download(url, name);
+  QString name;
+
+  KIO::NetAccess::download(url, name, this);
 
   playGround->reset();

--- kdegames/ktuberling/toplevel.h  #1.23:1.24
@@ -10,4 +10,5 @@
 
 #include <kmainwindow.h>
+#include <kurl.h>
 
 class QDomDocument;
@@ -24,4 +25,5 @@ public:
   ~TopLevel();
 
+  void open(const KURL &url);
   void enableUndo(bool enable) const;
   void enableRedo(bool enable) const;


[prev in list] [next in list] [prev in thread] [next in thread]