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

List:       kde-commits
Subject:    KDE/kdegames/kpat
From:       Parker Coates <parker.coates () kdemail ! net>
Date:       2012-02-15 4:45:04
Message-ID: 20120215044504.400E2AC894 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1280167 by coates:

Add a new mimetype for .kpat files.

The new "application/vnd.kde.kpatience.savedgame" will store the entire
history of a KPat game, instead of just the current state stored by the
current "application/vnd.kde.kpatience.savedstate" files.

 M  +8 -9      mainwindow.cpp  
 M  +6 -1      mimetypes/kpatience.xml  


--- trunk/KDE/kdegames/kpat/mainwindow.cpp #1280166:1280167
@@ -88,7 +88,8 @@
 namespace
 {
     const KUrl dialogUrl( "kfiledialog:///kpat" );
-    const QString kpatMimeType( "application/vnd.kde.kpatience.savedstate" );
+    const QString savedStateMimeType( "application/vnd.kde.kpatience.savedstate" );
+    const QString savedGameMimeType( "application/vnd.kde.kpatience.savedgame" );    
 }
 
 
@@ -891,18 +892,16 @@
 {
     KFileDialog dialog( dialogUrl, "", this, 0 );
     dialog.setOperationMode( KFileDialog::Opening );
-    dialog.setMimeFilter( QStringList() << kpatMimeType << "all/allfiles", kpatMimeType );
+    dialog.setMimeFilter( QStringList() << savedStateMimeType << savedGameMimeType << "all/allfiles" );
     dialog.setCaption( i18n("Load") );
 
-    if ( dialog.exec() != KFileDialog::Accepted )
-        return;
-
+    if ( dialog.exec() == KFileDialog::Accepted )
+    {
     KUrl url = dialog.selectedUrl();
-    if ( url.isEmpty() )
-        return;
-
+        if ( !url.isEmpty() )
     loadGame( url, true );
 }
+}
 
 void MainWindow::saveGame()
 {
@@ -911,7 +910,7 @@
 
     KFileDialog dialog( dialogUrl, "", this, 0 );
     dialog.setOperationMode( KFileDialog::Saving );
-    dialog.setMimeFilter( QStringList() << kpatMimeType, kpatMimeType );
+    dialog.setMimeFilter( QStringList() << savedStateMimeType << savedGameMimeType, savedGameMimeType );
     dialog.setConfirmOverwrite( true );
     dialog.setCaption( i18n("Save") );
     if ( dialog.exec() != KFileDialog::Accepted )
--- trunk/KDE/kdegames/kpat/mimetypes/kpatience.xml #1280166:1280167
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
   <mime-type type="application/vnd.kde.kpatience.savedstate">
-    <comment>KPatience saved game</comment>
+    <comment>KPatience saved state</comment>
     <sub-class-of type="application/xml"/>
     <magic priority="80">
       <match type="string" value="&lt;!DOCTYPE kpat" offset="0:50"/>
     </magic>
     <glob pattern="*.kpatience" weight="75"/>
   </mime-type>
+  <mime-type type="application/vnd.kde.kpatience.savedgame">
+    <comment>KPatience saved game</comment>
+    <sub-class-of type="application/xml"/>
+    <glob pattern="*.kpat" weight="75"/>
+  </mime-type>
 </mime-info>
[prev in list] [next in list] [prev in thread] [next in thread]