[prev in list] [next in list] [prev in thread] [next in thread]
List: kfm-devel
Subject: KDE/kdebase/apps/konqueror
From: David Faure <faure () kde ! org>
Date: 2008-08-29 22:38:15
Message-ID: 1220049495.870309.16958.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 854635 by dfaure:
Unify the konqueror.rc forks again. After the past work on moving \
filemanagement-specific actions to dolphinpart, there was no real difference left \
between konq-webbrowsing.rc and konq-filemanagement.rc. Just the hiding of reload and \
stop in filemanagement, but those are very useful for remote directories anyway, so \
let's have them back. On the other hand konqueror.rc kept rotting away but was still \
used as default in many places... So we had bugs like "RMB on a link, the new window \
has text under icons because it uses konqueror.rc instead of konq-webbrowsing.rc" -- \
which shows that the konqueror.rc/konq-webbrowsing.rc distinction made no sense \
either.
CCMAIL: kfm-devel@kde.org
M +1 -1 profile_filemanagement.desktop
M +1 -1 profile_filepreview.desktop
M +1 -1 profile_kde_devel.desktop
M +1 -1 profile_midnightcommander.desktop
D profile_simplebrowser.desktop
M +1 -1 profile_tabbedbrowsing.desktop
M +1 -1 profile_webbrowsing.desktop
M +1 -1 src/CMakeLists.txt
D src/konq-filemanagement.rc
D src/konq-simplebrowser.rc
D src/konq-webbrowsing.rc
M +11 -0 src/konqmainwindow.cpp
M +7 -3 src/konqmainwindow.h
M +4 -11 src/konqueror.rc
--- trunk/KDE/kdebase/apps/konqueror/profile_filemanagement.desktop #854634:854635
@@ -75,7 +75,7 @@
Name[xh]=Uphatho Lwefayile
Name[zh_CN]=文件管理
Name[zh_TW]=檔案管理
-XMLUIFile=konq-filemanagement.rc
+XMLUIFile=konqueror.rc
RootItem=Container0
Container0_Children=View1,Tabs1
Container0_Orientation=Horizontal
--- trunk/KDE/kdebase/apps/konqueror/profile_filepreview.desktop #854634:854635
@@ -81,7 +81,7 @@
Name[xh]=Imboniselo yasekuqaleni Yefayile
Name[zh_CN]=文件预览
Name[zh_TW]=檔案 覽
-XMLUIFile=konq-filemanagement.rc
+XMLUIFile=konqueror.rc
RootItem=Container0
View1_LinkedView=true
View1_LockedLocation=false
--- trunk/KDE/kdebase/apps/konqueror/profile_kde_devel.desktop #854634:854635
@@ -73,7 +73,7 @@
Name[x-test]=xxKDE Developmentxx
Name[zh_CN]=KDE 开发
Name[zh_TW]=KDE 程式開發
-XMLUIFile=konq-webbrowsing.rc
+XMLUIFile=konqueror.rc
RootItem=Tabs0
Tabs0_Children=ViewT0,ViewT1,ViewT2,ViewT3,ViewT4
Tabs0_activeChildIndex=0
--- trunk/KDE/kdebase/apps/konqueror/profile_midnightcommander.desktop #854634:854635
@@ -29,7 +29,7 @@
Name[th]=มิดไนท์คอมมานเดอร์ (MC)
Name[x-test]=xxMidnight Commanderxx
Name[xh]=Umyaleli Waphakathi kobusuku
-XMLUIFile=konq-filemanagement.rc
+XMLUIFile=konqueror.rc
RootItem=Container0
View2_LinkedView=true
View2_PassiveMode=false
--- trunk/KDE/kdebase/apps/konqueror/profile_tabbedbrowsing.desktop #854634:854635
@@ -74,7 +74,7 @@
Name[x-test]=xxTabbed Browsingxx
Name[zh_CN]= 签页浏览
Name[zh_TW]=分 瀏覽
-XMLUIFile=konq-webbrowsing.rc
+XMLUIFile=konqueror.rc
RootItem=Tabs0
Tabs0_Children=ViewT0,ViewT1,ViewT2,ViewT3
Tabs0_activeChildIndex=0
--- trunk/KDE/kdebase/apps/konqueror/profile_webbrowsing.desktop #854634:854635
@@ -74,7 +74,7 @@
Name[xh]=Ukhangelo lwencwadi ze Web
Name[zh_CN]=Web 浏览
Name[zh_TW]=網 瀏覽
-XMLUIFile=konq-webbrowsing.rc
+XMLUIFile=konqueror.rc
RootItem=View0
View0_ServiceName=konq_aboutpage
View0_ServiceType=KonqAboutPage
--- trunk/KDE/kdebase/apps/konqueror/src/CMakeLists.txt #854634:854635
@@ -95,5 +95,5 @@
########### install files ###############
install( FILES konqueror.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES konqueror.rc konq-webbrowsing.rc konq-filemanagement.rc DESTINATION \
${DATA_INSTALL_DIR}/konqueror ) +install( FILES konqueror.rc DESTINATION \
${DATA_INSTALL_DIR}/konqueror ) install( FILES org.kde.Konqueror.Main.xml \
org.kde.Konqueror.MainWindow.xml DESTINATION \
${DBUS_INTERFACES_INSTALL_DIR} )
--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.cpp #854634:854635
@@ -5821,4 +5821,15 @@
restoreWindowSize(profileGroup); // example: "Width 1400=1120"
}
+void KonqMainWindow::setXMLFile(const QString& _xmluiFile, bool merge, bool \
setXMLDoc) +{
+ QString xmluiFile = _xmluiFile;
+ // Compatibility with pre-kde-4.2 times where there were 2 forks of konqueror.rc
+ // Those have been merged back again, so convert to "konqueror.rc".
+ if (xmluiFile == "konq-filemanagement.rc" || xmluiFile == "konq-webbrowsing.rc")
+ xmluiFile = "konqueror.rc";
+
+ KParts::MainWindow::setXMLFile(xmluiFile, merge, setXMLDoc); // it's in \
KXMLGUIClient in fact +}
+
#include "konqmainwindow.moc"
--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.h #854634:854635
@@ -101,10 +101,12 @@
enum ComboAction { ComboClear, ComboAdd, ComboRemove };
enum PageSecurity { NotCrypted, Encrypted, Mixed };
- explicit KonqMainWindow( const KUrl &initialURL = KUrl(),
- const QString& xmluiFile="konqueror.rc");
- ~KonqMainWindow();
+ // TODO remove xmluiFile argument, this solution can't work for session \
management, + // see readProperties.
+ explicit KonqMainWindow(const KUrl &initialURL = KUrl(),
+ const QString& xmluiFile = "konqueror.rc");
+ ~KonqMainWindow();
/**
* Filters the URL and calls the main openUrl method.
@@ -557,6 +559,8 @@
private:
QString detectNameFilter( KUrl & url );
+ void setXMLFile(const QString& xmluiFile, bool merge = false, bool setXMLDoc = \
true); +
/**
* takes care of hiding the bookmarkbar and calling setChecked( false ) on the
* corresponding action
--- trunk/KDE/kdebase/apps/konqueror/src/konqueror.rc #854634:854635
@@ -26,7 +26,7 @@
<Action name="cut"/>
<Action name="copy"/>
<Action name="paste"/>
- <ActionList name="operations" /><!-- copy files and move files, when two directory \
views --> + <!--<ActionList name="operations" />--><!-- copy files and move files, \
when two directory views --> <WeakSeparator/>
<Merge/>
</Menu>
@@ -89,21 +89,15 @@
</Menu>
<Merge/>
</MenuBar>
-<ToolBar fullWidth="true" name="mainToolBar" newline="true"><text>Main \
Toolbar</text> +<ToolBar iconText="icononly" name="mainToolBar" \
newline="true"><text>Main Toolbar</text> <Action name="go_back"/>
<Action name="go_forward"/>
<Action name="go_up"/>
- <Action name="go_home"/>
- <Separator/>
<Action name="reload"/>
<Action name="stop"/>
- <Separator/>
- <Action name="print"/>
+ <Action name="go_home"/>
<WeakSeparator/>
<Merge/>
- <Separator/>
- <ActionList name="fullscreen" />
- <WeakSeparator/>
</ToolBar>
<ToolBar hidden="true" name="extraToolBar" newline="false" index="1"><text>Extra \
Toolbar</text> <Action name="konq_sidebartng" />
@@ -112,8 +106,7 @@
<Action name="splitviewh" />
<Action name="removeview" />
</ToolBar>
-<ToolBar fullWidth="true" name="locationToolBar" newline="true"><text>Location \
Toolbar</text>
- <Action name="location_label" />
+<ToolBar fullWidth="true" iconText="icononly" name="locationToolBar" \
newline="false"><text>Location Toolbar</text> <Action name="toolbar_url_combo" />
<Action name="go_url" />
</ToolBar>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic