From ac75b20aebb67b665c402867135b0184c493d963 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Wed, 29 Jul 2009 07:09:54 +0000 Subject: Fix for bug #396580 (non-ASCII characters not displayed correctly in the open dialog). (bzr r8355) --- src/ui/dialog/filedialogimpl-win32.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/ui/dialog/filedialogimpl-win32.cpp') diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 6fd753abb..0d8f0de5f 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -608,9 +608,12 @@ LRESULT CALLBACK FileOpenDialogImplWin32::preview_wnd_proc(HWND hwnd, UINT uMsg, if(pImpl->_path_string[0] == 0) { + WCHAR* noFileText=(WCHAR*)g_utf8_to_utf16(_("No file selected"), + -1, NULL, NULL, NULL); FillRect(dc, &rcClient, (HBRUSH)(COLOR_3DFACE + 1)); - DrawText(dc, _("No file selected"), -1, &rcClient, + DrawTextW(dc, noFileText, -1, &rcClient, DT_CENTER | DT_VCENTER | DT_NOPREFIX); + g_free(noFileText); } else if(pImpl->_preview_bitmap != NULL) { -- cgit v1.2.3 From 4cd79453c07adefb912a4dbd0afb2e7c2722bd90 Mon Sep 17 00:00:00 2001 From: johnce Date: Wed, 5 Aug 2009 06:38:07 +0000 Subject: SPDocument->Document (bzr r8408) --- src/ui/dialog/filedialogimpl-win32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/filedialogimpl-win32.cpp') diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 0d8f0de5f..4a2cc879d 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -887,7 +887,7 @@ bool FileOpenDialogImplWin32::set_svg_preview() gchar *utf8string = g_utf16_to_utf8((const gunichar2*)_path_string, _MAX_PATH, NULL, NULL, NULL); - SPDocument *svgDoc = sp_document_new (utf8string, true); + Document *svgDoc = sp_document_new (utf8string, true); g_free(utf8string); // Check the document loaded properly -- cgit v1.2.3 From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 6 Aug 2009 14:17:17 +0000 Subject: Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily. (bzr r8422) --- src/ui/dialog/filedialogimpl-win32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/filedialogimpl-win32.cpp') diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 4a2cc879d..0d8f0de5f 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -887,7 +887,7 @@ bool FileOpenDialogImplWin32::set_svg_preview() gchar *utf8string = g_utf16_to_utf8((const gunichar2*)_path_string, _MAX_PATH, NULL, NULL, NULL); - Document *svgDoc = sp_document_new (utf8string, true); + SPDocument *svgDoc = sp_document_new (utf8string, true); g_free(utf8string); // Check the document loaded properly -- cgit v1.2.3 From c5b0b577134ed7c2df538ed019a6c07cb75bf38e Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Fri, 7 Aug 2009 09:31:39 +0000 Subject: Store last used paths separately for the 'Save as ...' and 'Save a copy ...' dialogs and remember the last used file types in each case (closes LP #184655 and perhaps others; LP #386292 was fixed by the previous commit). (bzr r8432) --- src/ui/dialog/filedialogimpl-win32.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/filedialogimpl-win32.cpp') diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 0d8f0de5f..c703d3c75 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -1497,8 +1497,9 @@ FileSaveDialogImplWin32::FileSaveDialogImplWin32(Gtk::Window &parent, FileDialogType fileTypes, const char *title, const Glib::ustring &/*default_key*/, - const char *docTitle) : - FileDialogBaseWin32(parent, dir, title, fileTypes, "dialogs.save_as"), + const char *docTitle, + const bool save_copy) : + FileDialogBaseWin32(parent, dir, title, fileTypes, save_copy ? "dialogs.save_copy" : "dialogs.save_as"), _title_label(NULL), _title_edit(NULL) { -- cgit v1.2.3 From 606ebb35498c3d750bb2906954195baaa0fbcad6 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Sun, 9 Aug 2009 14:23:52 +0000 Subject: Fix remaining glitches in the behaviour of the Save dialogs (w.r.t. remembering the last file type and folder). As part of the cleanup inkscape:output_extension was removed, too. (bzr r8454) --- src/ui/dialog/filedialogimpl-win32.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/filedialogimpl-win32.cpp') diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index c703d3c75..690c74004 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -1498,8 +1498,9 @@ FileSaveDialogImplWin32::FileSaveDialogImplWin32(Gtk::Window &parent, const char *title, const Glib::ustring &/*default_key*/, const char *docTitle, - const bool save_copy) : - FileDialogBaseWin32(parent, dir, title, fileTypes, save_copy ? "dialogs.save_copy" : "dialogs.save_as"), + const FileSaveMethod save_method) : + FileDialogBaseWin32(parent, dir, title, fileTypes, + (save_method == FILE_SAVE_METHOD_SAVE_COPY) ? "dialogs.save_copy" : "dialogs.save_as"), _title_label(NULL), _title_edit(NULL) { -- cgit v1.2.3 From 093888a015ccaed8332ced7f0aaaa6ee7acb9517 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Mon, 10 Aug 2009 01:27:02 +0000 Subject: Add missing namespaces in win32 code (thanks to Yann Papouin for pointing this out) (bzr r8460) --- src/ui/dialog/filedialogimpl-win32.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/filedialogimpl-win32.cpp') diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 690c74004..2196ef0de 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -1498,9 +1498,9 @@ FileSaveDialogImplWin32::FileSaveDialogImplWin32(Gtk::Window &parent, const char *title, const Glib::ustring &/*default_key*/, const char *docTitle, - const FileSaveMethod save_method) : + const Inkscape::Extension::FileSaveMethod save_method) : FileDialogBaseWin32(parent, dir, title, fileTypes, - (save_method == FILE_SAVE_METHOD_SAVE_COPY) ? "dialogs.save_copy" : "dialogs.save_as"), + (save_method == Inkscape::Extension::FILE_SAVE_METHOD_SAVE_COPY) ? "dialogs.save_copy" : "dialogs.save_as"), _title_label(NULL), _title_edit(NULL) { -- cgit v1.2.3 From a655ef868bd318ef5ca60e7f25bf2987f313faec Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 15 Oct 2009 17:51:53 +0000 Subject: Fix for bug #423326 (Untranslated file types). Okayed by Joshua A. Andler on IRC (thanks!). (bzr r8779) --- src/ui/dialog/filedialogimpl-win32.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ui/dialog/filedialogimpl-win32.cpp') diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 2196ef0de..d22a368f2 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -193,11 +193,11 @@ void FileOpenDialogImplWin32::createFilterMenu() ustring all_inkscape_files_filter, all_image_files_filter, all_vectors_filter, all_bitmaps_filter; Filter all_files, all_inkscape_files, all_image_files, all_vectors, all_bitmaps; - const gchar *all_files_filter_name = N_("All Files"); - const gchar *all_inkscape_files_filter_name = N_("All Inkscape Files"); - const gchar *all_image_files_filter_name = N_("All Images"); - const gchar *all_vectors_filter_name = N_("All Vectors"); - const gchar *all_bitmaps_filter_name = N_("All Bitmaps"); + const gchar *all_files_filter_name = _("All Files"); + const gchar *all_inkscape_files_filter_name = _("All Inkscape Files"); + const gchar *all_image_files_filter_name = _("All Images"); + const gchar *all_vectors_filter_name = _("All Vectors"); + const gchar *all_bitmaps_filter_name = _("All Bitmaps"); // Calculate the amount of memory required int filter_count = 5; // 5 - one for each filter type -- cgit v1.2.3