zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Cleanup of dialog source/header files

pipelines/280567345
eidheim 5 years ago
parent
076ee4d7cf
commit
eefe86f2b2
12 changed files with 46 additions and 210 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/CMakeLists.txt
  2. 2
      src/cmake.cpp
  3. 32
      src/dialog.cpp
  4. 13
      src/dialog.hpp
  5. 31
      src/dialogs_unix.cpp
  6. 163
      src/dialogs_win.cpp
  7. 2
      src/meson.cpp
  8. 2
      src/source_clang.cpp
  9. 2
      src/usages_clang.cpp
  10. 2
      src/window.cpp
  11. 2
      tests/CMakeLists.txt
  12. 2
      tests/stubs/dialog.cpp

3
src/CMakeLists.txt
Unescape View File

@ -43,8 +43,7 @@ target_link_libraries(juci_shared
set(JUCI_FILES
config.cpp
dialogs.cpp
dialogs_unix.cpp
dialog.cpp
directories.cpp
entrybox.cpp
info.cpp

2
src/cmake.cpp
Unescape View File

@ -1,7 +1,7 @@
#include "cmake.hpp"
#include "compile_commands.hpp"
#include "config.hpp"
#include "dialogs.hpp"
#include "dialog.hpp"
#include "filesystem.hpp"
#include "terminal.hpp"
#include "utility.hpp"

32
src/dialogs.cpp → src/dialog.cpp
Unescape View File

@ -1,4 +1,4 @@
#include "dialogs.hpp"
#include "dialog.hpp"
#include "filesystem.hpp"
#include <cmath>
@ -94,3 +94,33 @@ std::string Dialog::gtk_dialog(const boost::filesystem::path &path, const std::s
dialog.add_button(button.first, button.second);
return dialog.run() == Gtk::RESPONSE_OK ? dialog.get_filename() : "";
}
std::string Dialog::open_folder(const boost::filesystem::path &path) {
return gtk_dialog(path, "Open Folder",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Open", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
}
std::string Dialog::new_file(const boost::filesystem::path &path) {
return gtk_dialog(path, "New File",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Save", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_SAVE);
}
std::string Dialog::new_folder(const boost::filesystem::path &path) {
return gtk_dialog(path, "New Folder",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Create", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_CREATE_FOLDER);
}
std::string Dialog::open_file(const boost::filesystem::path &path) {
return gtk_dialog(path, "Open File",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Select", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_OPEN);
}
std::string Dialog::save_file_as(const boost::filesystem::path &path) {
return gtk_dialog(path, "Save File As",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Save", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_SAVE);
}

13
src/dialogs.hpp → src/dialog.hpp
Unescape View File

@ -6,12 +6,6 @@
class Dialog {
public:
static std::string open_folder(const boost::filesystem::path &path);
static std::string open_file(const boost::filesystem::path &path);
static std::string new_file(const boost::filesystem::path &path);
static std::string new_folder(const boost::filesystem::path &path);
static std::string save_file_as(const boost::filesystem::path &path);
class Message : public Gtk::Window {
public:
Message(const std::string &text, std::function<void()> &&on_cancel = {}, bool show_progrss_bar = false);
@ -28,4 +22,11 @@ private:
static std::string gtk_dialog(const boost::filesystem::path &path, const std::string &title,
const std::vector<std::pair<std::string, Gtk::ResponseType>> &buttons,
Gtk::FileChooserAction gtk_options);
public:
static std::string open_folder(const boost::filesystem::path &path);
static std::string open_file(const boost::filesystem::path &path);
static std::string new_file(const boost::filesystem::path &path);
static std::string new_folder(const boost::filesystem::path &path);
static std::string save_file_as(const boost::filesystem::path &path);
};

31
src/dialogs_unix.cpp
Unescape View File

@ -1,31 +0,0 @@
#include "dialogs.hpp"
std::string Dialog::open_folder(const boost::filesystem::path &path) {
return gtk_dialog(path, "Open Folder",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Open", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
}
std::string Dialog::new_file(const boost::filesystem::path &path) {
return gtk_dialog(path, "New File",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Save", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_SAVE);
}
std::string Dialog::new_folder(const boost::filesystem::path &path) {
return gtk_dialog(path, "New Folder",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Create", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_CREATE_FOLDER);
}
std::string Dialog::open_file(const boost::filesystem::path &path) {
return gtk_dialog(path, "Open File",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Select", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_OPEN);
}
std::string Dialog::save_file_as(const boost::filesystem::path &path) {
return gtk_dialog(path, "Save File As",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Save", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_SAVE);
}

163
src/dialogs_win.cpp
Unescape View File

@ -1,163 +0,0 @@
#include "dialogs.hpp"
#include "juci.hpp"
#include "singletons.hpp"
#undef NTDDI_VERSION
#define NTDDI_VERSION NTDDI_VISTA
#undef _WIN32_WINNT
#define _WIN32_WINNT _WIN32_WINNT_VISTA
#include <shobjidl.h>
#include <vector>
#include <windows.h>
#include <iostream> //TODO: remove
using namespace std; //TODO: remove
class Win32Dialog {
public:
Win32Dialog(){};
~Win32Dialog() {
if(dialog)
dialog->Release();
}
/** Returns the selected item's path as a string */
std::string open(const std::wstring &title, unsigned option = 0) {
if(!init(CLSID_FileOpenDialog))
return "";
if(!set_title(title) || !add_option(option))
return "";
if(!set_folder())
return "";
return show();
}
std::string save(const std::wstring &title, const boost::filesystem::path &file_path = "", unsigned option = 0) {
if(!init(CLSID_FileSaveDialog))
return "";
if(!set_title(title) || !add_option(option))
return "";
if(!set_folder())
return "";
std::vector<COMDLG_FILTERSPEC> extensions;
if(!file_path.empty()) {
if(file_path.has_extension() && file_path.filename() != file_path.extension()) {
auto extension = (L"*" + file_path.extension().native()).c_str();
extensions.emplace_back(COMDLG_FILTERSPEC{extension, extension});
if(!set_default_file_extension(extension))
return "";
}
}
extensions.emplace_back(COMDLG_FILTERSPEC{L"All files", L"*.*"});
if(dialog->SetFileTypes(extensions.size(), extensions.data()) != S_OK)
return "";
return show();
}
private:
IFileDialog *dialog = nullptr;
DWORD options;
bool init(CLSID type) {
if(CoCreateInstance(type, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&dialog)) != S_OK)
return false;
if(dialog->GetOptions(&options) != S_OK)
return false;
return true;
}
/** available options are listed at https://msdn.microsoft.com/en-gb/library/windows/desktop/dn457282(v=vs.85).aspx */
bool add_option(unsigned option) {
if(dialog->SetOptions(options | option) != S_OK)
return false;
return true;
}
bool set_title(const std::wstring &title) {
if(dialog->SetTitle(title.c_str()) != S_OK)
return false;
return true;
}
/** Sets the extensions the browser can find */
bool set_default_file_extension(const std::wstring &file_extension) {
if(dialog->SetDefaultExtension(file_extension.c_str()) != S_OK)
return false;
return true;
}
/** Sets the directory to start browsing */
bool set_folder() {
auto g_application = g_application_get_default(); //TODO: Post issue that Gio::Application::get_default should return pointer and not Glib::RefPtr
auto gio_application = Glib::wrap(g_application, true);
auto application = Glib::RefPtr<Application>::cast_static(gio_application);
auto current_path = application->window->notebook.get_current_folder();
boost::system::error_code ec;
if(current_path.empty())
current_path = boost::filesystem::current_path(ec);
if(ec)
return false;
std::wstring path = current_path.native();
size_t pos = 0;
while((pos = path.find(L'/', pos)) != std::wstring::npos) { //TODO: issue bug report on boost::filesystem::path::native on MSYS2
path.replace(pos, 1, L"\\");
pos++;
}
IShellItem *folder = nullptr;
if(SHCreateItemFromParsingName(path.c_str(), nullptr, IID_PPV_ARGS(&folder)) != S_OK)
return false;
if(dialog->SetFolder(folder) != S_OK)
return false;
folder->Release();
return true;
}
std::string show() {
if(dialog->Show(nullptr) != S_OK)
return "";
IShellItem *result = nullptr;
if(dialog->GetResult(&result) != S_OK)
return "";
LPWSTR file_path = nullptr;
auto hresult = result->GetDisplayName(SIGDN_FILESYSPATH, &file_path);
result->Release();
if(hresult != S_OK)
return "";
std::wstring file_path_wstring(file_path);
std::string file_path_string(file_path_wstring.begin(), file_path_wstring.end());
CoTaskMemFree(file_path);
return file_path_string;
}
};
std::string Dialog::open_folder() {
return Win32Dialog().open(L"Open Folder", FOS_PICKFOLDERS);
}
std::string Dialog::new_file() {
return Win32Dialog().save(L"New File");
}
std::string Dialog::new_folder() {
//Win32 (IFileDialog) does not support create folder...
return gtk_dialog("New Folder",
{std::make_pair("Cancel", Gtk::RESPONSE_CANCEL), std::make_pair("Create", Gtk::RESPONSE_OK)},
Gtk::FILE_CHOOSER_ACTION_CREATE_FOLDER);
}
std::string Dialog::open_file() {
return Win32Dialog().open(L"Open File");
}
std::string Dialog::save_file_as(const boost::filesystem::path &file_path) {
return Win32Dialog().save(L"Save File As", file_path);
}

2
src/meson.cpp
Unescape View File

@ -1,7 +1,7 @@
#include "meson.hpp"
#include "compile_commands.hpp"
#include "config.hpp"
#include "dialogs.hpp"
#include "dialog.hpp"
#include "filesystem.hpp"
#include "terminal.hpp"
#include "utility.hpp"

2
src/source_clang.cpp
Unescape View File

@ -7,7 +7,7 @@
#endif
#include "compile_commands.hpp"
#include "ctags.hpp"
#include "dialogs.hpp"
#include "dialog.hpp"
#include "documentation.hpp"
#include "filesystem.hpp"
#include "info.hpp"

2
src/usages_clang.cpp
Unescape View File

@ -1,7 +1,7 @@
#include "usages_clang.hpp"
#include "compile_commands.hpp"
#include "config.hpp"
#include "dialogs.hpp"
#include "dialog.hpp"
#include "filesystem.hpp"
#include "utility.hpp"
#include <chrono>

2
src/window.cpp
Unescape View File

@ -4,7 +4,7 @@
#include "debug_lldb.hpp"
#endif
#include "compile_commands.hpp"
#include "dialogs.hpp"
#include "dialog.hpp"
#include "directories.hpp"
#include "entrybox.hpp"
#include "filesystem.hpp"

2
tests/CMakeLists.txt
Unescape View File

@ -9,7 +9,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
add_library(test_stubs OBJECT
stubs/config.cpp
stubs/dialogs.cpp
stubs/dialog.cpp
stubs/directories.cpp
stubs/info.cpp
stubs/notebook.cpp

2
tests/stubs/dialogs.cpp → tests/stubs/dialog.cpp
Unescape View File

@ -1,4 +1,4 @@
#include "dialogs.hpp"
#include "dialog.hpp"
Dialog::Message::Message(const std::string &text, std::function<void()> &&on_cancel, bool show_progress_bar) : Gtk::Window(Gtk::WindowType::WINDOW_POPUP) {}
Write Preview
Loading…
Cancel
Save