diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeL10n.txt | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/bookreader.cpp | 2 | ||||
| -rw-r--r-- | src/bookreader_client.cpp | 4 | ||||
| -rw-r--r-- | src/bookreaderiface.h | 2 | ||||
| -rw-r--r-- | src/bookwidget.cpp | 4 | ||||
| -rw-r--r-- | src/hi16-app-kbookreader.png (renamed from src/hi16-app-bookreader.png) | bin | 623 -> 623 bytes | |||
| -rw-r--r-- | src/hi32-app-kbookreader.png (renamed from src/hi32-app-bookreader.png) | bin | 1568 -> 1568 bytes | |||
| -rw-r--r-- | src/kbookreader.desktop (renamed from src/bookreader.desktop) | 14 | ||||
| -rw-r--r-- | src/kbookreader.kcfg (renamed from src/bookreader.kcfg) | 2 | ||||
| -rw-r--r-- | src/kbookreaderui.rc (renamed from src/bookreaderui.rc) | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/settings.kcfgc | 2 |
13 files changed, 27 insertions, 25 deletions
diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt index fb59dfa..f7e251b 100644 --- a/src/CMakeL10n.txt +++ b/src/CMakeL10n.txt @@ -1,8 +1,8 @@ ##### create translation templates ############## -tde_l10n_create_template( "messages/bookreader" ) +tde_l10n_create_template( "messages/kbookreader" ) tde_l10n_create_template( - CATALOG "desktop_files/bookreader.desktop/" - SOURCES bookreader.desktop + CATALOG "desktop_files/kbookreader.desktop/" + SOURCES kbookreader.desktop ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 50e6395..2e3332c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ link_directories( ##### bookreader (executable) -tde_add_executable( bookreader AUTOMOC +tde_add_executable( ${PROJECT_NAME} AUTOMOC SOURCES settingsdlg.ui @@ -39,7 +39,7 @@ tde_add_executable( bookreader AUTOMOC ##### bookreader_client (executable) -tde_add_executable( bookreader_client AUTOMOC +tde_add_executable( ${PROJECT_NAME}_client AUTOMOC SOURCES bookreader_client.cpp @@ -60,13 +60,13 @@ tde_install_icons( ) ##### other data install( - FILES bookreaderui.rc - DESTINATION ${DATA_INSTALL_DIR}/bookreader + FILES kbookreaderui.rc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} ) -tde_create_translated_desktop( bookreader.desktop ) +tde_create_translated_desktop( ${PROJECT_NAME}.desktop ) install( - FILES bookreader.kcfg + FILES ${PROJECT_NAME}.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/src/bookreader.cpp b/src/bookreader.cpp index 885e70f..78bfe94 100644 --- a/src/bookreader.cpp +++ b/src/bookreader.cpp @@ -72,7 +72,7 @@ TQStringList listEncodings() BookReader::BookReader() - : TDEMainWindow(0, "BookReader"), + : TDEMainWindow(0, "KBookReader"), m_view(new BookWidget(this)), m_fullScreenAction(0), m_splash(0), diff --git a/src/bookreader_client.cpp b/src/bookreader_client.cpp index 7e80050..59d5370 100644 --- a/src/bookreader_client.cpp +++ b/src/bookreader_client.cpp @@ -26,7 +26,7 @@ int main(int argc, char **argv) { - TDEApplication app(argc, argv, "bookreader_client", false); + TDEApplication app(argc, argv, "kbookreader_client", false); // get our DCOP client and attach so that we may use it DCOPClient *client = app.dcopClient(); @@ -39,7 +39,7 @@ int main(int argc, char **argv) ds << TQString(argv[1]); else ds << TQString("http://www.kde.org"); - client->send("bookreader", "BookReaderIface", "openURL(TQString)", data); + client->send("kbookreader", "KBookReaderIface", "openURL(TQString)", data); return app.exec(); } diff --git a/src/bookreaderiface.h b/src/bookreaderiface.h index 630b487..54166b8 100644 --- a/src/bookreaderiface.h +++ b/src/bookreaderiface.h @@ -24,7 +24,7 @@ #include <dcopobject.h> -class BookReaderIface : virtual public DCOPObject +class KBookReaderIface : virtual public DCOPObject { K_DCOP public: diff --git a/src/bookwidget.cpp b/src/bookwidget.cpp index 7a23d70..4fb1772 100644 --- a/src/bookwidget.cpp +++ b/src/bookwidget.cpp @@ -423,7 +423,7 @@ void BookWidget::addBookmark(const TQString& name) void BookWidget::saveBookmarks( ) { - const TQString fileName = "bookreader/" + m_url.fileName(); + const TQString fileName = "kbookreader/" + m_url.fileName(); TQFile::remove(TDEGlobal::dirs()->findResource("appdata", m_url.fileName())); TDEConfig config(fileName, false, false, "data"); for (Bookmarks::size_type i = 0; i < m_bookmarks.size(); ++i) @@ -439,7 +439,7 @@ void BookWidget::saveBookmarks( ) void BookWidget::loadBookmarks() { m_bookmarks.clear(); - const TQString fileName = "bookreader/" + m_url.fileName(); + const TQString fileName = "kbookreader/" + m_url.fileName(); TDEConfig config(fileName, true, false, "data"); TQStringList groups = config.groupList(); typedef TQStringList::const_iterator IT; diff --git a/src/hi16-app-bookreader.png b/src/hi16-app-kbookreader.png Binary files differindex f341b70..f341b70 100644 --- a/src/hi16-app-bookreader.png +++ b/src/hi16-app-kbookreader.png diff --git a/src/hi32-app-bookreader.png b/src/hi32-app-kbookreader.png Binary files differindex 47e119d..47e119d 100644 --- a/src/hi32-app-bookreader.png +++ b/src/hi32-app-kbookreader.png diff --git a/src/bookreader.desktop b/src/kbookreader.desktop index 327b944..1b9f208 100644 --- a/src/bookreader.desktop +++ b/src/kbookreader.desktop @@ -1,11 +1,13 @@ [Desktop Entry] -Encoding=UTF-8 -Name=BookReader +Name=KBookReader + GenericName=E-Book Reader -Exec=bookreader %i %m -caption "%c" -Icon=bookreader -Type=Application -X-DocPath=bookreader/index.html + Comment=A TDE KPart Application + +Type=Application +Exec=kbookreader %i %m -caption "%c" +Icon=kbookreader Terminal=false +X-DocPath=kbookreader/index.html Categories=Qt;TDE;Office; diff --git a/src/bookreader.kcfg b/src/kbookreader.kcfg index f140ac2..4272ca1 100644 --- a/src/bookreader.kcfg +++ b/src/kbookreader.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="bookreaderrc"/> + <kcfgfile name="kbookreaderrc"/> <group name="Preferences"> <entry name="Font" type="Font"> <label>The font used to display the contents of books.</label> diff --git a/src/bookreaderui.rc b/src/kbookreaderui.rc index 65c25af..d257dc1 100644 --- a/src/bookreaderui.rc +++ b/src/kbookreaderui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui version="1" name="bookreader" > +<kpartgui version="1" name="kbookreader" > <MenuBar> <Menu name="bookmarks" > <ActionList name="my_bookmarks" /> diff --git a/src/main.cpp b/src/main.cpp index fadd9a2..cb39cfb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,7 +35,7 @@ static TDECmdLineOptions options[] = int main(int argc, char **argv) { - TDEAboutData about("bookreader", I18N_NOOP("BooKreader"), version, description, + TDEAboutData about("kbookreader", I18N_NOOP("KBookReader"), version, description, TDEAboutData::License_GPL, "(C) 2005-2007 Alexander Nemish", 0, 0, "atlanter@gmail.com"); about.addAuthor("Alexander Nemish", 0, "atlanter@gmail.com"); diff --git a/src/settings.kcfgc b/src/settings.kcfgc index 4043e55..3daef00 100644 --- a/src/settings.kcfgc +++ b/src/settings.kcfgc @@ -1,5 +1,5 @@ # Code generation options for tdeconfig_compiler -File=bookreader.kcfg +File=kbookreader.kcfg ClassName=Settings Singleton=true Mutators=col_background,col_foreground |
