eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #ifdef compilation

Browse Source
This commit is contained in:
brunoherbelin
2021-03-27 18:21:13 +01:00
parent bc4eadfd08
commit e4c06ba1bb
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
DialogToolkit.cpp
View File

@@ -12,18 +12,18 @@
#define USE_TINYFILEDIALOG 1 #define USE_TINYFILEDIALOG 1
#endif #endif
#if USE_TINYFILEDIALOG
#include <tinyfiledialogs.h>
#else
#include <stdio.h>
#include <gtk/gtk.h>
#endif
#include "defines.h" #include "defines.h"
#include "SystemToolkit.h" #include "SystemToolkit.h"
#include "DialogToolkit.h" #include "DialogToolkit.h"
bool gtk_init_ok = false; #if USE_TINYFILEDIALOG
#include "tinyfiledialogs.h"
#else
#include <stdio.h>
#include <gtk/gtk.h>
static bool gtk_init_ok = false;
static int window_x = -1, window_y = -1;
void add_filter_any_file_dialog( GtkWidget *dialog) void add_filter_any_file_dialog( GtkWidget *dialog)
{ {
@@ -59,6 +59,7 @@ bool gtk_init()
} }
return gtk_init_ok; return gtk_init_ok;
} }
#endif
std::string DialogToolkit::saveSessionFileDialog(const std::string &path) std::string DialogToolkit::saveSessionFileDialog(const std::string &path)
{ {
@@ -97,9 +98,8 @@ std::string DialogToolkit::saveSessionFileDialog(const std::string &path)
// ensure front and centered // ensure front and centered
gtk_window_set_keep_above( GTK_WINDOW(dialog), TRUE ); gtk_window_set_keep_above( GTK_WINDOW(dialog), TRUE );
static int x = 0, y = 0; if (window_x > 0 && window_y > 0)
if (x != 0) gtk_window_move( GTK_WINDOW(dialog), window_x, window_y);
gtk_window_move( GTK_WINDOW(dialog), x, y);
// display and get filename // display and get filename
if ( gtk_dialog_run( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) { if ( gtk_dialog_run( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) {
@@ -111,11 +111,10 @@ std::string DialogToolkit::saveSessionFileDialog(const std::string &path)
} }
// remember position // remember position
gtk_window_get_position( GTK_WINDOW(dialog), &x, &y); gtk_window_get_position( GTK_WINDOW(dialog), &window_x, &window_y);
// done // done
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
// wait_for_event();
#endif #endif
return filename; return filename;
@@ -154,9 +153,8 @@ std::string DialogToolkit::openSessionFileDialog(const std::string &path)
// ensure front and centered // ensure front and centered
gtk_window_set_keep_above( GTK_WINDOW(dialog), TRUE ); gtk_window_set_keep_above( GTK_WINDOW(dialog), TRUE );
static int x = 0, y = 0; if (window_x > 0 && window_y > 0)
if (x != 0) gtk_window_move( GTK_WINDOW(dialog), window_x, window_y);
gtk_window_move( GTK_WINDOW(dialog), x, y);
// display and get filename // display and get filename
if ( gtk_dialog_run( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) { if ( gtk_dialog_run( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) {
@@ -168,11 +166,10 @@ std::string DialogToolkit::openSessionFileDialog(const std::string &path)
} }
// remember position // remember position
gtk_window_get_position( GTK_WINDOW(dialog), &x, &y); gtk_window_get_position( GTK_WINDOW(dialog), &window_x, &window_y);
// done // done
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
// wait_for_event();
#endif #endif
return filename; return filename;
@@ -216,9 +213,8 @@ std::string DialogToolkit::ImportFileDialog(const std::string &path)
// ensure front and centered // ensure front and centered
gtk_window_set_keep_above( GTK_WINDOW(dialog), TRUE ); gtk_window_set_keep_above( GTK_WINDOW(dialog), TRUE );
static int x = 0, y = 0; if (window_x > 0 && window_y > 0)
if (x != 0) gtk_window_move( GTK_WINDOW(dialog), window_x, window_y);
gtk_window_move( GTK_WINDOW(dialog), x, y);
// display and get filename // display and get filename
if ( gtk_dialog_run( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) { if ( gtk_dialog_run( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) {
@@ -230,11 +226,10 @@ std::string DialogToolkit::ImportFileDialog(const std::string &path)
} }
// remember position // remember position
gtk_window_get_position( GTK_WINDOW(dialog), &x, &y); gtk_window_get_position( GTK_WINDOW(dialog), &window_x, &window_y);
// done // done
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
// wait_for_event();
#endif #endif
return filename; return filename;
@@ -268,9 +263,8 @@ std::string DialogToolkit::FolderDialog(const std::string &path)
// ensure front and centered // ensure front and centered
gtk_window_set_keep_above( GTK_WINDOW(dialog), TRUE ); gtk_window_set_keep_above( GTK_WINDOW(dialog), TRUE );
static int x = 0, y = 0; if (window_x > 0 && window_y > 0)
if (x != 0) gtk_window_move( GTK_WINDOW(dialog), window_x, window_y);
gtk_window_move( GTK_WINDOW(dialog), x, y);
// display and get filename // display and get filename
if ( gtk_dialog_run( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) { if ( gtk_dialog_run( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) {
@@ -282,11 +276,10 @@ std::string DialogToolkit::FolderDialog(const std::string &path)
} }
// remember position // remember position
gtk_window_get_position( GTK_WINDOW(dialog), &x, &y); gtk_window_get_position( GTK_WINDOW(dialog), &window_x, &window_y);
// done // done
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
// wait_for_event();
#endif #endif
return foldername; return foldername;
@@ -319,7 +312,6 @@ void DialogToolkit::ErrorDialog(const char* message)
// done // done
gtk_widget_destroy( dialog ); gtk_widget_destroy( dialog );
// wait_for_event();
#endif #endif
} }