r14245 by cbradney - Bump about date and comment out Qt3 related UTF-16 hack
scribus-commit
scribus-commit at lists.scribus.net
Tue Oct 27 23:15:39 CET 2009
Revision: 14245
Author: cbradney
Date: 2009-10-27T18:15:47.758195Z
Commit message: Bump about date and comment out Qt3 related UTF-16 hack
Changeset:
M /branches/Version135/Scribus/scribus/about.cpp
M /branches/Version135/Scribus/scribus/gtdialogs.cpp
Diffs:
Index: scribus/about.cpp
===================================================================
--- scribus/about.cpp (revision 14244)
+++ scribus/about.cpp (revision 14245)
@@ -114,7 +114,7 @@
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
- QString BUILD_DAY = "08";
+ QString BUILD_DAY = "27";
QString BUILD_MONTH = CommonStrings::october;
QString BUILD_YEAR = "2009";
QString BUILD_TIME = "";
Index: scribus/gtdialogs.cpp
===================================================================
--- scribus/gtdialogs.cpp (revision 14244)
+++ scribus/gtdialogs.cpp (revision 14245)
@@ -134,8 +134,8 @@
if (!fileName.isEmpty())
accepted = true;
encoding = fdia->encodingCombo->currentText();
- if (encoding == "UTF-16")
- encoding = "ISO-10646-UCS-2";
+// if (encoding == "UTF-16")
+// encoding = "ISO-10646-UCS-2";
importer = fdia->importerCombo->currentIndex() - 1;
dirs->set("get_text", fileName.left(fileName.lastIndexOf("/")));
}
More information about the scribus-commit
mailing list