kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unify the konqueror.rc forks again. After the past work on moving filemanagement-specific actions to dolphinpart,

Browse source 
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

svn path=/trunk/KDE/kdebase/apps/; revision=854635
This commit is contained in:
David Faure 2008-08-29 22:38:14 +00:00
parent 9665910bdb
commit ecd67f2ab1
14 changed files with 29 additions and 440 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
konqueror/profile_filemanagement.desktop
View file

@ -75,7 +75,7 @@ Name[x-test]=xxFile Managementxx
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

2
konqueror/profile_filepreview.desktop
View file

@ -81,7 +81,7 @@ Name[x-test]=xxFile Previewxx
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

2
konqueror/profile_kde_devel.desktop
View file

@ -73,7 +73,7 @@ Name[wa]=Diswalpaedje KDE
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

2
konqueror/profile_midnightcommander.desktop
View file

@ -29,7 +29,7 @@ Name[tg]=Терминали графикӣ
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

81
konqueror/profile_simplebrowser.desktop
View file

@ -1,81 +0,0 @@
[Profile]
Name=Simple Browser
Name[af]=Eenvoudige Blaaier
Name[ar]=متصفح بسيط
Name[be]=Звычайны вандроўнік
Name[bn]=সরল ব্রাউজার
Name[bn_IN]=সাধারণ ব্রাউজার
Name[ca]=Navegador senzill
Name[cs]=Jednoduchý prohlížeč
Name[csb]=Prosti przezérnik
Name[cy]=Porydd Syml
Name[da]=Simpel browser
Name[de]=Einfacher Browser
Name[el]=Απλός περιηγητής ιστού
Name[eo]=Simpla foliumilo
Name[es]=Navegador sencillo
Name[et]=Lihtne brauser
Name[eu]=Web arakatzaile erraza
Name[fa]=مرورگر ساده‌
Name[fi]=Yksinkertainen selain
Name[fr]=Navigateur simple
Name[fy]=Ienfâldige blêder
Name[ga]=Brabhsálaí Simplí
Name[gl]=Navegador sinxelo
Name[gu]=સરળ બ્રાઉઝર
Name[he]=דפדפן פשוט
Name[hi]=सादा ब्राउज़र
Name[hr]=Jednostavni preglednik
Name[hu]=Egyszerű böngésző
Name[is]=Einfaldur vafri
Name[it]=Browser semplice
Name[ja]=簡易ブラウザ
Name[ka]=მარტივი ბრაუზერი
Name[kk]=Қарапайым шолғыш
Name[km]=កម្មវិធី​រុករក​សាមញ្ញ
Name[kn]=ಸರಳ ವೀಕ್ಷಕ
Name[ko]=간단한 탐색기
Name[ku]=Geroka Basît
Name[lt]=Paprasta naršyklė
Name[lv]=Vienkāršs pārlūks
Name[mk]=Едноставен прелистувач
Name[ml]=ലളിതമായ ബ്രൌസര്‍
Name[mr]=सादे ब्राउजर
Name[ms]=Pelayar Mudah
Name[nb]=Enkel nettleser
Name[nds]=Eenfach Nettkieker
Name[ne]=सामान्य ब्राउजर
Name[nl]=Eenvoudige browser
Name[nn]=Enkel nettlesar
Name[pa]=ਸਧਾਰਨ ਬਰਾਊਜ਼ਰ
Name[pl]=Prosta przeglądarka
Name[pt]=Navegação Simples
Name[pt_BR]=Navegador Web Simples
Name[ro]=Navigare simplă
Name[ru]=Простой браузер
Name[se]=Oktageardánis fierpmádatlogan
Name[sk]=Jednoduchý prehliadač
Name[sl]=Preprost brskalnik
Name[sr]=Једноставан прегледач
Name[sr@latin]=Jednostavan pregledač
Name[sv]=Enkel webbläsning
Name[ta]=எளிய உலாவி
Name[te]=సాధారణ అన్వేషణి
Name[tg]=Намоишгари оддӣ
Name[th]=เบราว์เซอร์พื้นฐาน
Name[tr]=Basit Tarayıcı
Name[uk]=Простий навігатор
Name[uz]=Oddiy veb-brauzer
Name[uz@cyrillic]=Оддий веб-браузер
Name[vi]=Trình duyệt đơn giản
Name[wa]=Betchteu waibe simpe
Name[x-test]=xxSimple Browserxx
Name[zh_CN]=简单浏览器
Name[zh_TW]=簡易瀏覽器
XMLUIFile=konq-simplebrowser.rc
RootItem=View0
View0_ServiceName=konq_aboutpage
View0_ServiceType=KonqAboutPage
View0_URL=about:konqueror
Width=60%
Height=80%

2
konqueror/profile_tabbedbrowsing.desktop
View file

@ -74,7 +74,7 @@ Name[wa]=Naiviaedje waibe avou des linwetes
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

2
konqueror/profile_webbrowsing.desktop
View file

@ -74,7 +74,7 @@ Name[x-test]=xxWeb Browsingxx
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

2
konqueror/src/CMakeLists.txt
View file

@ -95,5 +95,5 @@ install(TARGETS konqueror ${INSTALL_TARGETS_DEFAULT_ARGS})
########### 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} )

121
konqueror/src/konq-filemanagement.rc
View file

@ -1,121 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui name="Konqueror" version="67">
<MenuBar>
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="new_window"/>
<Action name="newtab"/>
<Separator/>
<Action name="open_location"/>
<Action name="open_file"/>
<Action name="sessions"/>
<Separator/>
<Action name="sendURL"/>
<Action name="sendPage"/>
<Separator/>
<Merge/> <!--Includes termination separator-->
<Action name="print"/>
<DefineGroup name="print" />
<Separator/>
<ActionList name="openwithbase"/>
<ActionList name="openwith" /> <!--Includes termination separator-->
<Action name="quit"/>
</Menu>
<Menu name="edit" noMerge="1"><text>&amp;Edit</text> <!--Here is what applies to a selection-->
<Action name="undo" />
<Action name="cut"/>
<Action name="copy"/>
<Action name="paste"/>
<!--<ActionList name="operations" />--><!-- copy files and move files, when two directory views -->
<WeakSeparator/>
<Merge/>
</Menu>
<Menu name="view" noMerge="1"><text>&amp;View</text> <!--Here is what applies to the active view-->
<ActionList name="viewmode" />
<Action name="usehtml"/>
<Action name="lock"/>
<Action name="link"/>
<Separator/>
<Action name="reload"/>
<Action name="stop" />
<WeakSeparator/>
<Merge/>
</Menu>
<Menu name="go"><text>&amp;Go</text>
<!-- go_up, go_back, go_forward, go_home: coming from ui_standards.rc -->
<Merge/>
<Action name="go_history"/>
<Separator/>
<Action name="go_most_often"/>
<Action name="history"/>
<Action name="closeditems"/>
</Menu>
<Action name="bookmarks"/>
<Menu name="settings" noMerge="1"><text>&amp;Settings</text>
<Merge name="StandardToolBarMenuHandler" />
<Action name="options_show_menubar"/>
<ActionList name="toggleview" />
<Separator/>
<Action name="fullscreen"/>
<Separator/>
<Action name="loadviewprofile"/>
<Action name="saveviewprofile"/>
<Action name="saveremoveviewprofile"/>
<Separator/>
<Action name="options_configure_extensions"/>
<Action name="configurespellcheck"/>
<Action name="options_configure_keybinding"/>
<Action name="options_configure_toolbars"/>
<Action name="options_configure"/>
</Menu>
<Menu name="window" append="settings_merge"><text>&amp;Window</text>
<Action name="splitviewh"/>
<Action name="splitviewv"/>
<Action name="removeview"/>
<Separator/>
<Action name="new_window"/>
<Action name="duplicate_window"/>
<Separator/>
<Action name="newtab"/>
<Action name="duplicatecurrenttab"/>
<Action name="breakoffcurrenttab"/>
<Action name="removecurrenttab"/>
<Separator/>
<Action name="tab_move_left"/>
<Action name="tab_move_right"/>
</Menu>
<Menu name="help" append="about_merge"><text>&amp;Help</text>
<Action name="konqintro"/>
</Menu>
<Merge/>
</MenuBar>
<ToolBar fullWidth="true" name="mainToolBar" newline="true"><text>Main Toolbar</text>
<Action name="go_back"/>
<Action name="go_forward"/>
<Action name="go_up"/>
<Separator/>
<Action name="go_home"/>
<Separator/>
</ToolBar>
<ToolBar hidden="true" name="extraToolBar" newline="false" index="1"><text>Extra Toolbar</text>
<Action name="konq_sidebartng" />
<Action name="findfile" />
<Action name="splitviewv" />
<Action name="splitviewh" />
<Action name="removeview" />
</ToolBar>
<ToolBar fullWidth="true" iconText="icononly" name="locationToolBar" newline="true"><text>Location Toolbar</text>
<Action name="toolbar_url_combo" />
<Action name="go_url" />
</ToolBar>
<ToolBar noEdit="true" iconText="icontextright" fullWidth="true" name="bookmarkToolBar" iconSize="16" newline="true"><text>Bookmark Toolbar</text>
</ToolBar>
<MainWindow>
<Action name="clear_location" />
</MainWindow>
<ActionProperties>
<Action shortcut="F9" name="konq_sidebartng" />
</ActionProperties>
</gui>

94
konqueror/src/konq-simplebrowser.rc
View file

@ -1,94 +0,0 @@
<?xml version = '1.0'?>
<!-- This file is used by the simplebrowser profile -->
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui name="Konqueror" version="56">
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;Location</text>
<Action name="new_window" />
<Action name="newtab" />
<Action name="open_location" />
<Separator/>
<Action name="sendURL" />
<Action name="sendPage" />
<Separator/>
<Merge/>
<Action name="print" />
<DefineGroup name="print" />
<Separator/>
<ActionList name="openwithbase"/>
<ActionList name="openwith" />
<Action name="quit" />
</Menu>
<Menu noMerge="1" name="edit" >
<text>&amp;Edit</text>
<Action name="copy" />
<Action name="paste" />
<Action name="del" />
<WeakSeparator/>
<Merge/>
</Menu>
<Menu noMerge="1" name="view" >
<text>&amp;View</text>
<Action name="history" />
<ActionList name="viewmode" />
<Separator/>
<Merge/>
</Menu>
<Action name="bookmarks" />
<Menu noMerge="1" name="settings" >
<text>&amp;Settings</text>
<Merge name="StandardToolBarMenuHandler" />
<Action name="saveviewprofile" />
<Action name="options_show_menubar" />
<Action name="fullscreen" />
<Separator/>
<Action name="options_configure_keybinding" />
<Action name="options_configure_toolbars" />
<Action name="options_configure_extensions" />
<Action name="options_configure" />
<Action name="configurespellcheck" />
</Menu>
<Menu append="about_merge" name="help" >
<text>&amp;Help</text>
<Action name="konqintro" />
</Menu>
<Merge/>
</MenuBar>
<ToolBar newline="true" hidden="true" name="mainToolBar">
<text>Main Toolbar</text>
<Action name="konq_sidebartng" />
<Separator name="separator_0" />
<Action name="print" />
<WeakSeparator/>
<Merge/>
<ActionList name="fullscreen" />
<WeakSeparator/>
</ToolBar>
<ToolBar newline="false" hidden="true" index="1" name="extraToolBar" >
<text>Extra Toolbar</text>
</ToolBar>
<ToolBar newline="true" noMerge="1" name="locationToolBar" fullWidth="true" >
<text>Location Toolbar</text>
<Action name="go_back" />
<Action name="go_forward" />
<Action name="go_up" />
<Action name="go_home" />
<Action name="reload" />
<Action name="stop" />
<Action name="security" />
<Action name="location_label" />
<Action name="toolbar_url_combo" />
<Action name="go_url" />
<Action name="animated_logo" />
</ToolBar>
<ToolBar newline="true" noEdit="true" iconText="icontextright" iconSize="16" name="bookmarkToolBar" fullWidth="true" >
<text>Bookmark Toolbar</text>
</ToolBar>
<MainWindow>
<Action name="clear_location" />
</MainWindow>
<ActionProperties>
<Action shortcut="F9" name="konq_sidebartng" />
</ActionProperties>
</gui>

123
konqueror/src/konq-webbrowsing.rc
View file

@ -1,123 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui name="Konqueror" version="66">
<MenuBar>
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="new_window"/>
<Action name="newtab"/>
<Separator/>
<Action name="open_location"/>
<Action name="open_file"/>
<Action name="sessions"/>
<Separator/>
<Action name="sendURL"/>
<Action name="sendPage"/>
<Separator/>
<Merge/> <!--Includes termination separator-->
<Action name="print"/>
<DefineGroup name="print" />
<Separator/>
<ActionList name="openwithbase"/>
<ActionList name="openwith" /> <!--Includes termination separator-->
<Action name="quit"/>
</Menu>
<Menu name="edit" noMerge="1"><text>&amp;Edit</text> <!--Here is what applies to a selection-->
<Action name="undo" />
<Action name="cut"/>
<Action name="copy"/>
<Action name="paste"/>
<!--<ActionList name="operations" />--><!-- copy files and move files, when two directory views -->
<WeakSeparator/>
<Merge/>
</Menu>
<Menu name="view" noMerge="1"><text>&amp;View</text> <!--Here is what applies to the active view-->
<ActionList name="viewmode" />
<Action name="usehtml"/>
<Action name="lock"/>
<Action name="link"/>
<Separator/>
<Action name="reload"/>
<Action name="stop" />
<WeakSeparator/>
<Merge/>
</Menu>
<Menu name="go"><text>&amp;Go</text>
<!-- go_up, go_back, go_forward, go_home: coming from ui_standards.rc -->
<Merge/>
<Action name="go_history"/>
<Separator/>
<Action name="go_most_often"/>
<Action name="history"/>
<Action name="closeditems"/>
</Menu>
<Action name="bookmarks"/>
<Menu name="settings" noMerge="1"><text>&amp;Settings</text>
<Merge name="StandardToolBarMenuHandler" />
<Action name="options_show_menubar"/>
<ActionList name="toggleview" />
<Separator/>
<Action name="fullscreen"/>
<Separator/>
<Action name="loadviewprofile"/>
<Action name="saveviewprofile"/>
<Action name="saveremoveviewprofile"/>
<Separator/>
<Action name="options_configure_extensions"/>
<Action name="configurespellcheck"/>
<Action name="options_configure_keybinding"/>
<Action name="options_configure_toolbars"/>
<Action name="options_configure"/>
</Menu>
<Menu name="window" append="settings_merge"><text>&amp;Window</text>
<Action name="splitviewh"/>
<Action name="splitviewv"/>
<Action name="removeview"/>
<Separator/>
<Action name="new_window"/>
<Action name="duplicate_window"/>
<Separator/>
<Action name="newtab"/>
<Action name="duplicatecurrenttab"/>
<Action name="breakoffcurrenttab"/>
<Action name="removecurrenttab"/>
<Separator/>
<Action name="tab_move_left"/>
<Action name="tab_move_right"/>
</Menu>
<Menu name="help" append="about_merge"><text>&amp;Help</text>
<Action name="konqintro"/>
</Menu>
<Merge/>
</MenuBar>
<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="reload"/>
<Action name="stop"/>
<Action name="go_home"/>
<WeakSeparator/>
<Merge/>
</ToolBar>
<ToolBar hidden="true" name="extraToolBar" newline="false" index="1"><text>Extra Toolbar</text>
<Action name="konq_sidebartng" />
<Action name="findfile" />
<Action name="splitviewv" />
<Action name="splitviewh" />
<Action name="removeview" />
</ToolBar>
<ToolBar fullWidth="true" iconText="icononly" name="locationToolBar" newline="false"><text>Location Toolbar</text>
<Action name="toolbar_url_combo" />
<Action name="go_url" />
</ToolBar>
<ToolBar noEdit="true" iconText="icontextright" fullWidth="true" name="bookmarkToolBar" iconSize="16" newline="true"><text>Bookmark Toolbar</text>
</ToolBar>
<MainWindow>
<Action name="clear_location" />
</MainWindow>
<ActionProperties>
<Action shortcut="F9" name="konq_sidebartng" />
</ActionProperties>
</gui>

11
konqueror/src/konqmainwindow.cpp
View file

@ -5821,4 +5821,15 @@ void KonqMainWindow::applyWindowSizeFromProfile(const KConfigGroup& profileGroup
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"

10
konqueror/src/konqmainwindow.h
View file

@ -101,10 +101,12 @@ public:
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 Q_SLOTS:
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

15
konqueror/src/konqueror.rc
View file

@ -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>