liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with 'Beep6581/dev'

Browse Source
This commit is contained in:
Pandagrapher
2023-09-05 09:48:43 +02:00
parent d8c0b521ab 7c73da7723
commit 990e9c70a5
91 changed files with 1524 additions and 1157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtgui/filebrowser.cc
View File

@@ -272,7 +272,7 @@ FileBrowser::FileBrowser () :
/***********************
* external programs
* *********************/
#if defined(WIN32)
#if defined(_WIN32)
Gtk::manage(miOpenDefaultViewer = new Gtk::MenuItem (M("FILEBROWSER_OPENDEFAULTVIEWER")));
#endif
@@ -296,7 +296,7 @@ FileBrowser::FileBrowser () :
p++;
Gtk::Menu* submenuExtProg = Gtk::manage (new Gtk::Menu());
#ifdef WIN32
#ifdef _WIN32
if (miOpenDefaultViewer) {
submenuExtProg->attach (*miOpenDefaultViewer, 0, 1, p, p + 1);
p++;
@@ -310,7 +310,7 @@ FileBrowser::FileBrowser () :
submenuExtProg->show_all ();
menuExtProg->set_submenu (*submenuExtProg);
} else {
#ifdef WIN32
#ifdef _WIN32
if (miOpenDefaultViewer) {
pmenu->attach (*miOpenDefaultViewer, 0, 1, p, p + 1);
p++;
@@ -482,7 +482,7 @@ FileBrowser::FileBrowser () :
amiExtProg[i]->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), amiExtProg[i]));
}
#ifdef WIN32
#ifdef _WIN32
if (miOpenDefaultViewer) {
miOpenDefaultViewer->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), miOpenDefaultViewer));
}
@@ -1046,7 +1046,7 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m)
tbl->clearFromCacheRequested (mselected, true);
//queue_draw ();
#ifdef WIN32
#ifdef _WIN32
} else if (miOpenDefaultViewer && m == miOpenDefaultViewer) {
openDefaultViewer(1);
#endif
@@ -1157,7 +1157,7 @@ void FileBrowser::partPasteProfile ()
}
}
#ifdef WIN32
#ifdef _WIN32
void FileBrowser::openDefaultViewer (int destination)
{
bool success = true;
@@ -1254,7 +1254,7 @@ bool FileBrowser::keyPressed (GdkEventKey* event)
}
openRequested(mselected);
#ifdef WIN32
#ifdef _WIN32
} else if (event->keyval == GDK_KEY_F5) {
int dest = 1;
@@ -1276,7 +1276,7 @@ bool FileBrowser::keyPressed (GdkEventKey* event)
}
#ifdef __WIN32__
else if (shift && !ctrl && !alt && !altgr) { // rank
else if (!shift && !ctrl && !alt && !altgr) { // rank
switch(event->hardware_keycode) {
case 0x30: // 0-key
requestRanking (0);
@@ -1331,7 +1331,7 @@ bool FileBrowser::keyPressed (GdkEventKey* event)
}
#else
else if (shift && !ctrl && !alt) { // rank
else if (!shift && !ctrl && !alt) { // rank
switch(event->hardware_keycode) {
case 0x13:
requestRanking (0);