[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegraphics/kviewshell/shell
From: Stefan Kebekus <kebekus () kde ! org>
Date: 2006-11-14 7:23:43
Message-ID: 1163489023.793209.8721.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 604768 by kebekus:
rename library to avoid conflicts with existing installations
M +10 -10 CMakeLists.txt
M +2 -2 kmultipage.h
D kviewerpart.rc
D kviewpart.cpp
D kviewpart.h
M +8 -8 ligature.cpp
M +2 -2 ligature.h
M +1 -1 ligature.kcfg
A ligaturepart.cpp kviewpart.cpp#604641 [License: UNKNOWN]
A ligaturepart.h kviewpart.h#604641 [License: no copyright]
A ligaturepart.rc kviewerpart.rc#604641
M +1 -1 presentationwidget.cpp
--- trunk/KDE/kdegraphics/kviewshell/shell/CMakeLists.txt #604767:604768
@@ -56,35 +56,35 @@
install(TARGETS ligaturecore DESTINATION ${LIB_INSTALL_DIR} )
-########### kviewerpart ###############
+########### ligaturepart ###############
-set(kviewerpart_PART_SRCS
+set(ligaturepart_PART_SRCS
dlgpresentation.cpp
optionDialogAccessibilityWidget.cpp
optionDialogGUIWidget.cpp
bookmarkList.cpp
exportDialog.cpp
- kviewpart.cpp
+ ligaturepart.cpp
marklist.cpp
presentationwidget.cpp
searchWidget.cpp
tableOfContents.cpp )
-kde4_automoc(${kviewerpart_PART_SRCS})
+kde4_automoc(${ligaturepart_PART_SRCS})
-kde4_add_ui_files(kviewerpart_PART_SRCS
+kde4_add_ui_files(ligaturepart_PART_SRCS
dlgpresentation.ui
optionDialogAccessibilityWidget.ui
optionDialogGUIWidget.ui )
-kde4_add_kcfg_files(kviewerpart_PART_SRCS kvsprefs.kcfgc )
+kde4_add_kcfg_files(ligaturepart_PART_SRCS kvsprefs.kcfgc )
-kde4_add_plugin(kviewerpart ${kviewerpart_PART_SRCS})
+kde4_add_plugin(ligaturepart ${ligaturepart_PART_SRCS})
-target_link_libraries(kviewerpart ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} \
ligaturecore ) +target_link_libraries(ligaturepart ${KDE4_KDECORE_LIBS} \
${KDE4_KPARTS_LIBS} ligaturecore )
-install(TARGETS kviewerpart DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS ligaturepart DESTINATION ${PLUGIN_INSTALL_DIR} )
########### kmultipage ###############
@@ -113,7 +113,7 @@
install( FILES ligature.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES ligature.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES kviewerpart.rc DESTINATION ${DATA_INSTALL_DIR}/kviewerpart )
+install( FILES ligaturepart.rc DESTINATION ${DATA_INSTALL_DIR}/ligaturepart )
install( FILES ligature.rc DESTINATION ${DATA_INSTALL_DIR}/ligature )
install( FILES kmultipage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kmultipageInterface.h DESTINATION ${INCLUDE_INSTALL_DIR})
--- trunk/KDE/kdegraphics/kviewshell/shell/kmultipage.h #604767:604768
@@ -64,8 +64,8 @@
baseURL=http://www.x.x/x.dvi The file may refer to external graphic
files using relative links.
- The file is downloaded by the kviewpart to a temporary file on the
- hard disk, say /tmp/t.dvi. The kviewpart would then call this method
+ The file is downloaded by the ligaturepart to a temporary file on the
+ hard disk, say /tmp/t.dvi. The ligaturepart would then call this method
with filename=/tmp/t.dvi and baseURL=http://www.x.x/x.dvi, so the
DVI-renderer knows to interpret the link to t.jpg as
http://www.x.x/t.jpg, and will download the file from there.
--- trunk/KDE/kdegraphics/kviewshell/shell/ligature.cpp #604767:604768
@@ -11,7 +11,7 @@
#include <config.h>
-#include "kviewpart.h"
+#include "ligaturepart.h"
#include "ligature.h"
#include "kvs_debug.h"
#include "toolindicator.h"
@@ -65,23 +65,23 @@
// create the viewer part
// Try to load
- KLibFactory *factory = KLibLoader::self()->factory("kviewerpart");
+ KLibFactory *factory = KLibLoader::self()->factory("ligaturepart");
if (factory) {
if (defaultMimeType == QString::null)
- view = static_cast<KViewPart*>(factory->create(this, "KViewPart"));
+ view = static_cast<LigaturePart*>(factory->create(this, "LigaturePart"));
else {
QStringList args;
args << defaultMimeType;
- view = static_cast<KViewPart*>(factory->create(this, "KViewPart", args));
+ view = static_cast<LigaturePart*>(factory->create(this, "LigaturePart", \
args)); }
if (!view) {
- kError() << "FATAL ERROR: Loading of the KViewPart failed. Aborting..." << \
endl; + kError() << "FATAL ERROR: Loading of the LigaturePart failed. \
Aborting..." << endl; ::exit(-1);
}
} else
KMessageBox::detailedError(this,
i18n("<qt>A fatal error ocurred. An important library \
could not be found. Ligature will not work.</qt>"),
- i18n("<qt><p>The Ligature application uses the \
<strong>kviewerpart</strong> library internally. " + \
i18n("<qt><p>The Ligature application uses the <strong>ligaturepart</strong> library \
internally. "
"This library was not found on your \
computer.</p>"
"<p>The problem is most likely a broken \
installation of the Ligature application. "
"You could try to uninstall all instances of \
Ligature and then re-install the latest version.</p></qt>"), @@ -99,7 +99,7 @@
version = "Version 0, probaby from KDE 3.4 or older";
KMessageBox::detailedError(this,
i18n("<qt>A fatal error ocurred. An incompatible \
version of an important library was found. Ligature will not \
work.</qt>"),
- i18n("<qt><p>The Ligature application uses the \
<strong>kviewerpart</strong> library internally. " + \
i18n("<qt><p>The Ligature application uses the <strong>ligaturepart</strong> library \
internally. "
"A version of this library was found, but this \
version is <strong>not</strong> compatible with the current version " "of the \
Ligature application.</p>"
"<p>Version found: <strong>%1</strong></p>"
@@ -310,7 +310,7 @@
if (view == 0)
return;
- // Get the URL of the opened file from the kviewpart.
+ // Get the URL of the opened file from the ligaturepart.
KUrl actualURL = view->url();
// To store the URL in the list of recent files, we remove the
// reference part.
--- trunk/KDE/kdegraphics/kviewshell/shell/ligature.h #604767:604768
@@ -10,7 +10,7 @@
class KToggleAction;
class KToggleFullScreenAction;
class KUrl;
-class KViewPart;
+class LigaturePart;
class QLabel;
class QTemporaryFile;
@@ -72,7 +72,7 @@
private:
KStatusBar* statusbar;
- KViewPart* view;
+ LigaturePart* view;
KRecentFilesAction* recent;
QString cwd;
--- trunk/KDE/kdegraphics/kviewshell/shell/ligature.kcfg #604767:604768
@@ -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="kviewerpartrc" />
+ <kcfgfile name="ligaturepartrc" />
<group name="GUI" >
<entry key="PageMarks" type="Bool">
<default>true</default>
--- trunk/KDE/kdegraphics/kviewshell/shell/presentationwidget.cpp #604767:604768
@@ -229,7 +229,7 @@
}
else
{
- // Let the kviewpart handle nonlocal links.
+ // Let the ligaturepart handle nonlocal links.
emit httpLink(hyperlink);
}
return;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic