Changeset 8964fdc in visorpdf

Timestamp:

Oct 19, 2016, 10:01:23 AM (8 years ago)

Author:

Pedro Buitrago <pbuitrago@…>

Branches:

master

Children:

b396a79

Parents:

e8a029e

Message:

Se realiza las modificaciones para agregar el nombre del proyecto murrupuy y la información sobre el proyecto

Files:

• miscellaneous/murrupuy.1 (added)
• miscellaneous/murrupuy.desktop (added)
• miscellaneous/murrupuy.desktop.in (added)
• sources/helpdialog.cpp (modified) (1 diff)
• sources/main.cpp (modified) (3 diffs)
• sources/pdfmodel.cpp (modified) (1 diff)
• sources/settings.cpp (modified) (1 diff)
• sources/settingsdialog.cpp (modified) (1 diff)
• sources/shortcuthandler.cpp (modified) (1 diff)

sources/helpdialog.cpp

@@ -38 +38 @@
 HelpDialog::HelpDialog(QWidget* parent) : QDialog(parent)
 {
-    setWindowTitle(tr("Help") + QLatin1String(" - qpdfview"));
+    setWindowTitle(tr("Help") + QLatin1String(" - Murrupuy"));
 
     m_textBrowser = new QTextBrowser(this);

sources/main.cpp

@@ -114 +114 @@
     if(toolkitTranslator->load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { qApp->installTranslator(toolkitTranslator); }
 
-    if(applicationTranslator->load(QLocale::system(), "qpdfview", "_", QDir(QApplication::applicationDirPath()).filePath("data"))) { qApp->installTranslator(applicationTranslator); }
-    else if(applicationTranslator->load(QLocale::system(), "qpdfview", "_", DATA_INSTALL_PATH)) { qApp->installTranslator(applicationTranslator); }
+    if(applicationTranslator->load(QLocale::system(), "murrupuy", "_", QDir(QApplication::applicationDirPath()).filePath("data"))) { qApp->installTranslator(applicationTranslator); }
+    else if(applicationTranslator->load(QLocale::system(), "murrupuy", "_", DATA_INSTALL_PATH)) { qApp->installTranslator(applicationTranslator); }
+    //if(applicationTranslator->load(QLocale::system(), "TibisayPDFView", "_", QDir(QApplication::applicationDirPath()).filePath("data"))) { qApp->installTranslator(applicationTranslator); }
+    //else if(applicationTranslator->load(QLocale::system(), "TibisayPDFView", "_", DATA_INSTALL_PATH)) { qApp->installTranslator(applicationTranslator); }
 
 #else
@@ -121 +123 @@
     if(toolkitTranslator->load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { qApp->installTranslator(toolkitTranslator); }
 
-    if(applicationTranslator->load("qpdfview_" + QLocale::system().name(), QDir(QApplication::applicationDirPath()).filePath("data"))) { qApp->installTranslator(applicationTranslator); }
-    else if(applicationTranslator->load("qpdfview_" + QLocale::system().name(), DATA_INSTALL_PATH)) { qApp->installTranslator(applicationTranslator); }
-
+    if(applicationTranslator->load("murrupuy" + QLocale::system().name(), QDir(QApplication::applicationDirPath()).filePath("data"))) { qApp->installTranslator(applicationTranslator); }
+    else if(applicationTranslator->load("murrupuy_" + QLocale::system().name(), DATA_INSTALL_PATH)) { qApp->installTranslator(applicationTranslator); }
+//    if(applicationTranslator->load("TibisayPDFView_" + QLocale::system().name(), QDir(QApplication::applicationDirPath()).filePath("data"))) { qApp->installTranslator(applicationTranslator); }
+//    else if(applicationTranslator->load("TibisayPDFView_" + QLocale::system().name(), DATA_INSTALL_PATH)) { qApp->installTranslator(applicationTranslator); }
 #endif // QT_VERSION
 }
@@ -461 +464 @@
 
     QApplication application(argc, argv);
-
-    QApplication::setOrganizationDomain("local.qpdfview");
-    QApplication::setOrganizationName("qpdfview");
-    QApplication::setApplicationName("qpdfview");
+    QApplication::setOrganizationDomain("local.murrupuy");
+  //  QApplication::setOrganizationDomain("local.qpdfview");
+//    QApplication::setOrganizationName("qpdfview");
+//    QApplication::setApplicationName("qpdfview");
+    QApplication::setOrganizationName("murrupuy");
+    QApplication::setApplicationName("murrupuy");
 
     QApplication::setApplicationVersion(APPLICATION_VERSION);

sources/pdfmodel.cpp

@@ -1151 +1151 @@
     setObjectName("PdfPlugin");
 
-    m_settings = new QSettings("qpdfview", "pdf-plugin", this);
+//    m_settings = new QSettings("qpdfview", "pdf-plugin", this);
+    m_settings = new QSettings("murrupuy", "pdf-plugin", this);
+
 }
 

sources/settings.cpp

@@ -1118 +1118 @@
 
 Settings::Settings(QObject* parent) : QObject(parent),
-    m_settings(new QSettings("qpdfview", "qpdfview", this)),
+//    m_settings(new QSettings("qpdfview", "qpdfview", this)),
+    m_settings(new QSettings("murrupuy", "murrupuy", this)),
     m_pageItem(m_settings),
     m_presentationView(m_settings),

sources/settingsdialog.cpp

@@ -102 +102 @@
     }
 
-    setWindowTitle(tr("Settings") + QLatin1String(" - qpdfview"));
+    setWindowTitle(tr("Settings") + QLatin1String(" - murrupuy"));
 
     m_graphicsTabWidget = new QTabWidget(this);

sources/shortcuthandler.cpp

@@ -260 +260 @@
 
 ShortcutHandler::ShortcutHandler(QObject* parent) : QAbstractTableModel(parent),
-    m_settings(new QSettings("qpdfview", "shortcuts", this)),
+//    m_settings(new QSettings("qpdfview", "shortcuts", this)),
+    m_settings(new QSettings("murrupuy", "shortcuts", this)),
     m_actions(),
     m_shortcuts(),