Browse Source

Make tr use UTF-8

Neal Wilson 8 years ago
parent
commit
1eb0159c22
7 changed files with 899 additions and 895 deletions
  1. 2
    0
      src/Typica.pro
  2. 1
    1
      src/abouttypica.cpp
  3. 1
    1
      src/helpmenu.cpp
  4. 1
    1
      src/licensewindow.cpp
  5. 1
    1
      src/qrc_resources.cpp
  6. 892
    891
      src/typica.cpp
  7. 1
    0
      src/typica.w

+ 2
- 0
src/Typica.pro View File

44
 RC_FILE = typica.rc
44
 RC_FILE = typica.rc
45
 ICON = resources/icons/appicons/logo.icns
45
 ICON = resources/icons/appicons/logo.icns
46
 QMAKE_INFO_PLIST = resources/Info.plist
46
 QMAKE_INFO_PLIST = resources/Info.plist
47
+
48
+CODECFORTR = UTF-8

+ 1
- 1
src/abouttypica.cpp View File

17
 setCentralWidget(banner);
17
 setCentralWidget(banner);
18
 }
18
 }
19
 
19
 
20
-#line 6591 "./typica.w"
20
+#line 6592 "./typica.w"
21
 
21
 
22
 /*:276*/
22
 /*:276*/
23
 #line 36 "./abouttypica.w"
23
 #line 36 "./abouttypica.w"

+ 1
- 1
src/helpmenu.cpp View File

42
 window->show();
42
 window->show();
43
 }
43
 }
44
 
44
 
45
-#line 4771 "./typica.w"
45
+#line 4772 "./typica.w"
46
 
46
 
47
 #line 1 "./licensewindow.w"
47
 #line 1 "./licensewindow.w"
48
 /*:207*/
48
 /*:207*/

+ 1
- 1
src/licensewindow.cpp View File

11
 #include <QVariant> 
11
 #include <QVariant> 
12
 #include <QUrl> 
12
 #include <QUrl> 
13
 
13
 
14
-#line 4773 "./typica.w"
14
+#line 4774 "./typica.w"
15
 
15
 
16
 /*:213*/
16
 /*:213*/
17
 #line 37 "./licensewindow.w"
17
 #line 37 "./licensewindow.w"

+ 1
- 1
src/qrc_resources.cpp View File

40553
   0x67,0x72,0x61,0x6d,0x73,0x2f,0x74,0x79,0x70,0x69,0x63,0x61,0x2f,0x22,0x3e,0x54,
40553
   0x67,0x72,0x61,0x6d,0x73,0x2f,0x74,0x79,0x70,0x69,0x63,0x61,0x2f,0x22,0x3e,0x54,
40554
   0x79,0x70,0x69,0x63,0x61,0x3c,0x2f,0x61,0x3e,0x3c,0x2f,0x68,0x31,0x3e,0xa,0x9,
40554
   0x79,0x70,0x69,0x63,0x61,0x3c,0x2f,0x61,0x3e,0x3c,0x2f,0x68,0x31,0x3e,0xa,0x9,
40555
   0x9,0x9,0x9,0x9,0x3c,0x68,0x32,0x3e,0x56,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,
40555
   0x9,0x9,0x9,0x9,0x3c,0x68,0x32,0x3e,0x56,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,
40556
-  0x31,0x2e,0x36,0x2e,0x34,0x3c,0x2f,0x68,0x32,0x3e,0xa,0x9,0x9,0x9,0x9,0x3c,
40556
+  0x31,0x2e,0x37,0x2e,0x30,0x3c,0x2f,0x68,0x32,0x3e,0xa,0x9,0x9,0x9,0x9,0x3c,
40557
   0x2f,0x64,0x69,0x76,0x3e,0xa,0x9,0x9,0x9,0x3c,0x64,0x69,0x76,0x20,0x69,0x64,
40557
   0x2f,0x64,0x69,0x76,0x3e,0xa,0x9,0x9,0x9,0x3c,0x64,0x69,0x76,0x20,0x69,0x64,
40558
   0x3d,0x22,0x6d,0x61,0x69,0x6e,0x74,0x65,0x78,0x74,0x22,0x3e,0xa,0x9,0x9,0x9,
40558
   0x3d,0x22,0x6d,0x61,0x69,0x6e,0x74,0x65,0x78,0x74,0x22,0x3e,0xa,0x9,0x9,0x9,
40559
   0x9,0x3c,0x70,0x3e,0x43,0x6f,0x70,0x79,0x72,0x69,0x67,0x68,0x74,0x20,0x26,0x63,
40559
   0x9,0x3c,0x70,0x3e,0x43,0x6f,0x70,0x79,0x72,0x69,0x67,0x68,0x74,0x20,0x26,0x63,

+ 892
- 891
src/typica.cpp
File diff suppressed because it is too large
View File


+ 1
- 0
src/typica.w View File

4351
     QFile file(filename);
4351
     QFile file(filename);
4352
     QFileInfo info(filename);
4352
     QFileInfo info(filename);
4353
     directory = info.dir();
4353
     directory = info.dir();
4354
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("utf-8"));
4354
     QTranslator *configtr = new QTranslator;
4355
     QTranslator *configtr = new QTranslator;
4355
     if(configtr->load(QString("config.%1").arg(QLocale::system().name()),
4356
     if(configtr->load(QString("config.%1").arg(QLocale::system().name()),
4356
                      QString("%1/Translations").arg(directory.canonicalPath())))
4357
                      QString("%1/Translations").arg(directory.canonicalPath())))

Loading…
Cancel
Save