aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvilib/config/kvi_fileextensions.h31
-rw-r--r--src/kvirc/ui/kvi_filedialog.cpp4
-rw-r--r--src/modules/actioneditor/actioneditor.cpp4
-rw-r--r--src/modules/addon/managementdialog.cpp5
-rw-r--r--src/modules/aliaseditor/aliaseditor.cpp3
-rw-r--r--src/modules/eventeditor/eventeditor.cpp5
-rw-r--r--src/modules/popupeditor/popupeditor.cpp5
-rw-r--r--src/modules/raweditor/raweditor.cpp6
-rw-r--r--src/modules/theme/savethemedialog.cpp3
-rw-r--r--src/modules/toolbareditor/toolbareditor.cpp3
10 files changed, 41 insertions, 28 deletions
diff --git a/src/kvilib/config/kvi_fileextensions.h b/src/kvilib/config/kvi_fileextensions.h
index 9658466fe..341c4a92f 100644
--- a/src/kvilib/config/kvi_fileextensions.h
+++ b/src/kvilib/config/kvi_fileextensions.h
@@ -56,14 +56,27 @@
* \def KVI_FILTER_IMAGE Image file *.png *.jpg *.jpeg *.bmp *.gif *.xpm
* \def KVI_FILTER_UI User interface file *.ui
*/
-#define KVI_FILTER_CONFIG "KVIrc Config (*.kvc)"
-#define KVI_FILTER_SCRIPT "KVIrc Script (*.kvs)"
-#define KVI_FILTER_THEME "KVIrc Theme (*.kvt)"
-#define KVI_FILTER_ADDON "KVIrc Addon (*.kva)"
-// Provided for convenience
-#define KVI_FILTER_SCRIPTS "KVIrc Script and Addon (*.kvs *.kva)"
-#define KVI_FILTER_INI "INI File (*.ini)"
-#define KVI_FILTER_IMAGE "Image File (*.png *.jpg *.jpeg *.bmp *.gif *.xpm)"
-#define KVI_FILTER_UI "User Interface File (*.ui)"
+
+#ifdef COMPILE_KDE_SUPPORT
+ #define KVI_FILTER_CONFIG "*.kvc|KVIrc Config (*.kvc)"
+ #define KVI_FILTER_SCRIPT "*.kvs|KVIrc Script (*.kvs)"
+ #define KVI_FILTER_THEME "*.kvt|KVIrc Theme (*.kvt)"
+ #define KVI_FILTER_ADDON "*.kva|KVIrc Addon (*.kva)"
+ // Provided for convenience
+ #define KVI_FILTER_SCRIPTS "*.kvs *.kva|KVIrc Script and Addon (*.kvs *.kva)"
+ #define KVI_FILTER_INI "*.ini|INI File (*.ini)"
+ #define KVI_FILTER_IMAGE "*.png *.jpg *.jpeg *.bmp *.gif *.xpm|Image File (*.png *.jpg *.jpeg *.bmp *.gif *.xpm)"
+ #define KVI_FILTER_UI "*.ui|User Interface File (*.ui)"
+#else
+ #define KVI_FILTER_CONFIG "KVIrc Config (*.kvc)"
+ #define KVI_FILTER_SCRIPT "KVIrc Script (*.kvs)"
+ #define KVI_FILTER_THEME "KVIrc Theme (*.kvt)"
+ #define KVI_FILTER_ADDON "KVIrc Addon (*.kva)"
+ // Provided for convenience
+ #define KVI_FILTER_SCRIPTS "KVIrc Script and Addon (*.kvs *.kva)"
+ #define KVI_FILTER_INI "INI File (*.ini)"
+ #define KVI_FILTER_IMAGE "Image File (*.png *.jpg *.jpeg *.bmp *.gif *.xpm)"
+ #define KVI_FILTER_UI "User Interface File (*.ui)"
+#endif //COMPILE_KDE_SUPPORT
#endif //_KVI_FILEEXTENSIONS_H_
diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp
index d5d070ce9..aaaea0f84 100644
--- a/src/kvirc/ui/kvi_filedialog.cpp
+++ b/src/kvirc/ui/kvi_filedialog.cpp
@@ -80,7 +80,7 @@ bool KviFileDialog::askForOpenFileName(QString & szBuffer, const QString & szCap
KviFileDialog * pDialog = new KviFileDialog(szInitial,szFilter,pParent,"open_file_name_dialog",true);
pDialog->setWindowTitle(szCaption);
// i was ignorant
- pDialog->setFileMode(KviTalFileDialog::AnyFile);
+ pDialog->setFileMode(KviTalFileDialog::ExistingFile);
//pDialog->setShowHiddenFiles(showHidden);
if(pDialog->exec() == QDialog::Accepted)
@@ -244,7 +244,7 @@ bool KviFileDialog::askForOpenFileNames(QStringList & szBuffer, const QString &
KviFileDialog * pDialog = new KviFileDialog(szInitial,szFilter,pParent,"open_file_names_dialog",true);
pDialog->setWindowTitle(szCaption);
- // See line 190
+ // See line 190
pDialog->setFileMode(KviTalFileDialog::ExistingFiles);
//pDialog->setShowHiddenFiles(showHidden);
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 437587017..3767a7f31 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -28,7 +28,6 @@
#include "kvi_locale.h"
#include "kvi_imagedialog.h"
#include "kvi_config.h"
-#include "kvi_filedialog.h"
#include "kvi_fileutils.h"
#include "kvi_scripteditor.h"
#include "kvi_debug.h"
@@ -43,6 +42,7 @@
#include "kvi_tal_vbox.h"
#include <kvi_tal_groupbox.h>
#include "kvi_tal_itemdelegates.h"
+#include "kvi_fileextensions.h"
#include <QList>
#include <QSplitter>
@@ -689,7 +689,7 @@ void KviActionEditor::exportActions()
QString szFile;
- if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,QString(),true,true,true))return;
+ if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
QString szCode;
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 513eeef30..8acfd3e53 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -285,14 +285,13 @@ void KviScriptManagementDialog::installScript()
// Switch between script and addon
if(szFileName.endsWith(".kvs"))
{
- qDebug("Script file .kvs");
QString szCmd = "parse \"";
szCmd += szFileName;
szCmd += "\"";
KviKvsScript::run(szCmd,g_pActiveWindow);
- } else if(szFileName.endsWith(".kva")){
- qDebug("Addon file .kva");
+ } else if(szFileName.endsWith(".kva"))
+ {
if(!KviAddonFunctions::installAddonPackage(szFileName,szError,this))
{
QMessageBox::critical(
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 4e9d9cae9..1e7bbdf47 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -42,6 +42,7 @@
#include "kvi_cmdformatter.h"
#include "kvi_module.h"
#include "kvi_tal_vbox.h"
+#include "kvi_fileextensions.h"
#include <QList>
#include <QSplitter>
@@ -805,7 +806,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles)
else szNameFile="aliases";
szName += szNameFile;
szName += ".kvs";
- if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,"*.kvs",false,true,true))
+ if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,false,true,true))
{
g_pAliasEditorModule->unlock();
return;
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 5380019d3..c99778c30 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -33,10 +33,9 @@
#include "kvi_fileutils.h"
#include "kvi_scripteditor.h"
#include "kvi_debug.h"
-//#include "kvi_event.h"
#include "kvi_app.h"
#include "kvi_cmdformatter.h"
-//#include "kvi_eventhandler.h"
+#include "kvi_fileextensions.h"
#include "kvi_qstring.h"
#include "kvi_filedialog.h"
#include "kvi_kvs_eventmanager.h"
@@ -444,7 +443,7 @@ void KviEventEditor::exportCurrentHandler()
QString szFile;
- if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,"*.kvs",true,true,true))return;
+ if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
QString szOut;
getExportEventBuffer(szOut,m_pLastEditedItem);
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 69586d24a..a0f004137 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -40,6 +40,7 @@
#include "kvi_kvs_variantlist.h"
#include "kvi_pointerhashtable.h"
#include "kvi_tal_vbox.h"
+#include "kvi_fileextensions.h"
#include <QMessageBox>
#include <QDir>
@@ -1107,7 +1108,7 @@ void KviPopupEditor::exportCurrentPopup()
QString szFile;
- if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,"*.kvs",true,true,true))return;
+ if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
QString szOut;
m_pLastEditedItem->popup()->generateDefPopup(szOut);
@@ -1157,7 +1158,7 @@ void KviPopupEditor::exportPopups(bool bSelectedOnly)
QString szFile;
- if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,"*.kvs",true,true,true))return;
+ if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
if(!KviFileUtils::writeFile(szFile,out))
{
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index bae1cd11a..fb0067c9f 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -34,7 +34,7 @@
#include "kvi_fileutils.h"
#include "kvi_scripteditor.h"
#include "kvi_debug.h"
-//#include "kvi_event.h"
+#include "kvi_fileextensions.h"
#include "kvi_app.h"
#include "kvi_cmdformatter.h"
#include "kvi_kvs_eventmanager.h"
@@ -416,7 +416,7 @@ void KviRawEditor::exportCurrentHandler()
QString szFile;
- if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,"*.kvs",true,true,true))return;
+ if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
QString szOut;
getExportEventBuffer(szOut,m_pLastEditedItem);
@@ -459,7 +459,7 @@ void KviRawEditor::exportAllEvents()
QString szFile;
- if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,"*.kvs",true,true,true))return;
+ if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
if(!KviFileUtils::writeFile(szFile,out))
{
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index 7741a6e69..cea3933b7 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -158,8 +158,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
m_pImageLabel->setAlignment(Qt::AlignCenter | Qt::AlignVCenter);
pLayout->addWidget(m_pImageLabel,1,0);
- QString szFilter = "*.png *.jpg *.xpm";
- m_pImageSelector = new KviFileSelector(pPage,"",&m_szScreenshotPath,true,0,szFilter);
+ m_pImageSelector = new KviFileSelector(pPage,"",&m_szScreenshotPath,true,0,KVI_FILTER_IMAGE);
connect(m_pImageSelector,SIGNAL(selectionChanged(const QString &)),this,SLOT(imageSelectionChanged(const QString &)));
pLayout->addWidget(m_pImageSelector,2,0);
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 54229a5f4..2f3b798f1 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -38,6 +38,7 @@
#include "kvi_filedialog.h"
#include "kvi_kvs_useraction.h"
#include "kvi_tal_tooltip.h"
+#include "kvi_fileextensions.h"
#include <QPushButton>
#include <QLayout>
@@ -390,7 +391,7 @@ void KviCustomizeToolBarsDialog::exportToolBar()
QString szFile;
- if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,"*.kvs",true,true,true))return;
+ if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true))return;
QString szCode;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 05:18:33 +0000