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

List:       kde-commits
Subject:    KDE/kdesdk/lokalize/src
From:       Nick Shaforostoff <shafff () ukr ! net>
Date:       2012-09-13 10:44:34
Message-ID: 20120913104434.C5A9DAC7CB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1316160 by shaforo:

BUG: 305971

add .ts and .xliff to filter for merge open



 M  +1 -0      catalog/catalog.cpp  
 M  +3 -0      catalog/catalog.h  
 M  +2 -2      editortab.cpp  
 M  +2 -2      mergemode/mergeview.cpp  


--- trunk/KDE/kdesdk/lokalize/src/catalog/catalog.cpp #1316159:1316160
@@ -67,6 +67,7 @@
 #include <kio/netaccess.h>
 #include <ktemporaryfile.h>
 
+QString Catalog::supportedMimeFilters("text/x-gettext-translation \
application/x-xliff application/x-linguist");  
 static const char* const extensions[]={".po",".pot",".xlf", ".ts"};
 
--- trunk/KDE/kdesdk/lokalize/src/catalog/catalog.h #1316159:1316160
@@ -255,6 +255,9 @@
     friend class MergeCatalog;
     friend class SetEquivTransCmd;
 
+public:
+    static QString supportedMimeFilters;
+
 signals:
     void signalEntryModified(const DocPosition&);
     void activePhaseChanged();
--- trunk/KDE/kdesdk/lokalize/src/editortab.cpp #1316159:1316160
@@ -1,7 +1,7 @@
 /* ****************************************************************************
   This file is part of Lokalize
 
-  Copyright (C) 2007-2011 by Nick Shaforostoff <shafff@ukr.net>
+  Copyright (C) 2007-2012 by Nick Shaforostoff <shafff@ukr.net>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -807,7 +807,7 @@
     {
         //Prevent crashes
         Project::instance()->model()->weaver()->suspend();
-        url=KFileDialog::getOpenFileName(baseUrl, "text/x-gettext-translation \
text/x-gettext-translation-template application/x-xliff \
application/x-linguist",SettingsController::instance()->mainWindowPtr()); +        \
url=KFileDialog::getOpenFileName(baseUrl, Catalog::supportedMimeFilters + " \
text/x-gettext-translation-template", \
SettingsController::instance()->mainWindowPtr());  \
Project::instance()->model()->weaver()->resume();  //TODO application/x-xliff, \
windows: just extensions  //originalPath=url.path(); never used
--- trunk/KDE/kdesdk/lokalize/src/mergemode/mergeview.cpp #1316159:1316160
@@ -1,7 +1,7 @@
 /* ****************************************************************************
   This file is part of Lokalize
 
-  Copyright (C) 2007-2009 by Nick Shaforostoff <shafff@ukr.net>
+  Copyright (C) 2007-2012 by Nick Shaforostoff <shafff@ukr.net>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -209,7 +209,7 @@
     if (url.isEmpty())
     {
         Project::instance()->model()->weaver()->suspend();
-        url=KFileDialog::getOpenUrl(KUrl("kfiledialog:///merge-source") \
/*m_baseCatalog->url()*/ , "text/x-gettext-translation",this); +        \
url=KFileDialog::getOpenUrl(KUrl("kfiledialog:///merge-source") \
/*m_baseCatalog->url()*/ , Catalog::supportedMimeFilters, this);  \
Project::instance()->model()->weaver()->resume();  }
     if (url.isEmpty())


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