diff options
Diffstat (limited to 'konqueror')
228 files changed, 2080 insertions, 7681 deletions
diff --git a/konqueror/CMakeL10n.txt b/konqueror/CMakeL10n.txt index a0cac1f72..c54286f6a 100644 --- a/konqueror/CMakeL10n.txt +++ b/konqueror/CMakeL10n.txt @@ -8,3 +8,9 @@ tde_l10n_create_template( ) tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/konqueror-desktops/" + SOURCES *.desktop *.directory + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/konqueror/CMakeLists.txt b/konqueror/CMakeLists.txt index 0c99b911c..aa6091502 100644 --- a/konqueror/CMakeLists.txt +++ b/konqueror/CMakeLists.txt @@ -55,23 +55,72 @@ install( FILES ##### other data ################################ install( FILES konqueror.rc konq-simplebrowser.rc DESTINATION ${DATA_INSTALL_DIR}/konqueror ) -install( FILES konqueror.desktop DESTINATION ${APPS_INSTALL_DIR} ) -install( FILES konqfilemgr.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) + +tde_create_translated_desktop( + SOURCE konqueror.desktop + DESTINATION ${APPS_INSTALL_DIR} + PO_DIR konqueror-desktops +) + +tde_create_translated_desktop( + SOURCE konqfilemgr.desktop + DESTINATION ${APPS_INSTALL_DIR}/.hidden + PO_DIR konqueror-desktops +) + install( FILES konqueror.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -install( FILES +tde_create_translated_desktop( + SOURCE kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} ) + PO_DIR konqueror-desktops +) set( PROFILEDIR ${DATA_INSTALL_DIR}/konqueror/profiles ) -install( FILES profile_webbrowsing.desktop DESTINATION ${PROFILEDIR} RENAME webbrowsing ) -install( FILES profile_filemanagement.desktop DESTINATION ${PROFILEDIR} RENAME filemanagement ) -install( FILES profile_midnightcommander.desktop DESTINATION ${PROFILEDIR} RENAME midnightcommander ) -install( FILES profile_tabbedbrowsing.desktop DESTINATION ${PROFILEDIR} RENAME tabbedbrowsing ) -install( FILES profile_kde_devel.desktop DESTINATION ${PROFILEDIR} RENAME kde_devel ) -install( FILES profile_simplebrowser.desktop DESTINATION ${PROFILEDIR} RENAME simplebrowser ) + +tde_create_translated_desktop( + SOURCE profile_webbrowsing.desktop + DESTINATION ${PROFILEDIR} + OUTPUT_NAME webbrowsing + PO_DIR konqueror-desktops +) + +tde_create_translated_desktop( + SOURCE profile_filemanagement.desktop + DESTINATION ${PROFILEDIR} + OUTPUT_NAME filemanagement + PO_DIR konqueror-desktops +) + +tde_create_translated_desktop( + SOURCE profile_midnightcommander.desktop + DESTINATION ${PROFILEDIR} + OUTPUT_NAME midnightcommander + PO_DIR konqueror-desktops +) + +tde_create_translated_desktop( + SOURCE profile_tabbedbrowsing.desktop + DESTINATION ${PROFILEDIR} + OUTPUT_NAME tabbedbrowsing + PO_DIR konqueror-desktops +) + +tde_create_translated_desktop( + SOURCE profile_kde_devel.desktop + DESTINATION ${PROFILEDIR} + OUTPUT_NAME kde_devel + PO_DIR konqueror-desktops +) + +tde_create_translated_desktop( + SOURCE profile_simplebrowser.desktop + DESTINATION ${PROFILEDIR} + OUTPUT_NAME simplebrowser + PO_DIR konqueror-desktops +) ##### konqueror_intern (static lib) ############# @@ -92,13 +141,13 @@ tde_add_library( ${target} STATIC_PIC set( target konqueror ) set( ${target}_SRCS - konq_main.cc KonquerorIface.cc KonquerorIface.skel - KonqMainWindowIface.cc KonqMainWindowIface.skel - KonqViewIface.cc KonqViewIface.skel konq_guiclients.cc - konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc - konq_frame.cc konq_tabs.cc konq_actions.cc konq_profiledlg.cc - konq_factory.cc konq_combo.cc konq_browseriface.cc - delayedinitializer.cc konq_mainwindow.cc konq_extensionmanager.cc + konq_main.cpp KonquerorIface.cpp KonquerorIface.skel + KonqMainWindowIface.cpp KonqMainWindowIface.skel + KonqViewIface.cpp KonqViewIface.skel konq_guiclients.cpp + konq_run.cpp konq_view.cpp konq_viewmgr.cpp konq_misc.cpp + konq_frame.cpp konq_tabs.cpp konq_actions.cpp konq_profiledlg.cpp + konq_factory.cpp konq_combo.cpp konq_browseriface.cpp + delayedinitializer.cpp konq_mainwindow.cpp konq_extensionmanager.cpp ) tde_add_tdeinit_executable( ${target} AUTOMOC diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog index bdd198606..a6b8bed4c 100644 --- a/konqueror/ChangeLog +++ b/konqueror/ChangeLog @@ -5,14 +5,14 @@ 2001-05-05 David Faure <faure@kde.org> - * konq_mainwindow.cc: Set WDestructiveClose again when going + * konq_mainwindow.cpp: Set WDestructiveClose again when going to fullscreen mode (Qt bug), to prevent Alt+F4 from crashing. - * konq_misc.cc: Only abort full-screen mode for windows on the + * konq_misc.cpp: Only abort full-screen mode for windows on the current desktop. 2001-05-01 Simon Hausmann <simon@kde.org> - * konq_mainwindow.cc : moved the connect and disconnect calls + * konq_mainwindow.cpp : moved the connect and disconnect calls to/from the highlighting signals of the actioncollections into two separate methods, for cleanup, and use the qt child deletion mechanism to delete the bookmark actioncollection @@ -26,11 +26,11 @@ starts flickering like mad, when the window width is getting small than the length of the url in the combobox. - * konq_mainwindow.cc (initActions): use KonqGoURLAction + * konq_mainwindow.cpp (initActions): use KonqGoURLAction 2001-04-27 Simon Hausmann <simon@kde.org> - * konq_mainwindow.cc (goURL): new slot, sending a fake key + * konq_mainwindow.cpp (goURL): new slot, sending a fake key event to the lineedit, acting like the user pressing return (initActions): allocate a "Go" action and connect it to the new goURL slot @@ -39,22 +39,22 @@ 2001-04-07 Simon Hausmann <simon@kde.org> - * konq_mainwindow.cc (slotReload): call m_currentView->lockHistory(), + * konq_mainwindow.cpp (slotReload): call m_currentView->lockHistory(), to fix #23818 - * konq_view.cc/h (reload): removed obsolete method + * konq_view.cpp/h (reload): removed obsolete method 2001-03-31 David Faure <faure@kde.org> - * konq_mainwindow.cc(slotRunFinished): Stop wheel animation when a + * konq_mainwindow.cpp(slotRunFinished): Stop wheel animation when a konqrun fails and we have no view. 2001-03-25 Simon Hausmann <simon@kde.org> - * iconview/konq_iconview.cc (KonqKfmIconView): specify a status text for + * iconview/konq_iconview.cpp (KonqKfmIconView): specify a status text for some actions. Likewise for some actions in KonqDirPart. Also call setHighlightingEnabled in the KonqDirPart constructor - * konq_mainwindow.cc (slotShowMenuBar): call saveMainWindowSettings and + * konq_mainwindow.cpp (slotShowMenuBar): call saveMainWindowSettings and TDEGlobal::config()->sync() after toggling the visiblity of the menubar, just like it is done for toolbars. (slotPartActivated): connect and disconnect to/from the actionStatusText @@ -62,25 +62,25 @@ 2001-03-02 Simon Hausmann <simon@kde.org> - * konq_view.cc, konq_browseriface.cc/h: Utilize and implement the newly + * konq_view.cpp, konq_browseriface.cpp/h: Utilize and implement the newly added KParts::BrowserInterface 2001-02-06 Simon Hausmann <simon@kde.org> - * konq_mainwindow.cc (openBookmarkURL): Patch by + * konq_mainwindow.cpp (openBookmarkURL): Patch by Marco Krohn <Marco.Krohn@stud.uni-hannover.de> to call openFilteredURL instead of openURL. Allows environment variables in bookmarks and other sugar. 2001-01-28 Stephan Kulow <coolo@kde.org> - * konq_mainwindow.cc (initActions): Plug the actions into a TDEAccel to + * konq_mainwindow.cpp (initActions): Plug the actions into a TDEAccel to fix short cuts in full screen mode 2001-01-16 Simon Hausmann <simon@kde.org> - * konq_actions.cc (fillHistoryPopup), - libkonq/kbookmarkmenu.cc (fillBookmarkMenu): When a Website has + * konq_actions.cpp (fillHistoryPopup), + libkonq/kbookmarkmenu.cpp (fillBookmarkMenu): When a Website has "&" in the Title, make sure to transform it into "&&" before inserting it into a QPopupMenu (for history or for bookmarks) , to avoid QPopupMenu interpreting it as accelerator. @@ -88,30 +88,30 @@ 2001-01-15 David Faure <faure@kde.org> - * konq_aboutpage.cc, konq_mainwindow.cc: Support for "about:konqueror". + * konq_aboutpage.cpp, konq_mainwindow.cpp: Support for "about:konqueror". Credits to Simon for the part, and Torsten for the icons. 2001-01-14 David Faure <faure@kde.org> - * konq_viewmgr.cc (loadItem): Use openView instead of view->openURL, + * konq_viewmgr.cpp (loadItem): Use openView instead of view->openURL, so that "view-follows-view" is also applied on startup. Fixes #17679. - * konq_mainwindow.cc etc.: Lock to current location doesn't make the + * konq_mainwindow.cpp etc.: Lock to current location doesn't make the view passive anymore. This allows to e.g. change the view mode. - * konq_frame.cc: Added Lock / Unlock to view statusbar's popupmenu. + * konq_frame.cpp: Added Lock / Unlock to view statusbar's popupmenu. 2001-01-13 David Faure <faure@kde.org> - * konq_dirpart.cc etc.: Always paste to current directory, even + * konq_dirpart.cpp etc.: Always paste to current directory, even when an item is selected. 2001-01-12 David Faure <faure@kde.org> - * konq_viewmgr.cc (loadViewProfile): Set active part before loading + * konq_viewmgr.cpp (loadViewProfile): Set active part before loading URL, so that the URL appears in the location bar. - * konq_mainwindow.cc, konq_dirpart.cc: Store find part into history, + * konq_mainwindow.cpp, konq_dirpart.cpp: Store find part into history, in order to restore it when pressing back. 2001-01-11 David Faure <faure@kde.org> @@ -132,7 +132,7 @@ 2001-01-08 Simon Hausmann <simon@kde.org> - * KonquerorIface.cc (openBrowserWindow), + * KonquerorIface.cpp (openBrowserWindow), (createNewWindow), (createNewWindow), (createBrowserWindowFromProfile), @@ -150,14 +150,14 @@ 2000-12-28 Simon Hausmann <simon@kde.org> - * konq_viewmgr.cc (loadViewProfile): When loading an empty profile + * konq_viewmgr.cpp (loadViewProfile): When loading an empty profile (in particular the webbrowsing one) , activate the clear_location action. This gives the focus to the location bar -> the user can type in an url right away when loading the webbrowsing profile 2000-12-27 Simon Hausmann <simon@kde.org> - * konq_mainwindow.cc (enableAllActions): for iterating over all actions + * konq_mainwindow.cpp (enableAllActions): for iterating over all actions don't use the action( int index ) method of TDEActionCollection but instead retrieve a QValueList<TDEAction *> and iterate over that, as the =+(int) operator of QDictIterator isn't really fast @@ -166,16 +166,16 @@ 2000-12-12 David Faure <faure@kde.org> - * konq_viewmgr.cc: Fixed saving of profiles containing views + * konq_viewmgr.cpp: Fixed saving of profiles containing views "locked to their current location". The attribute was missing from the profile. - * konq_mainwindow.cc: Save and restore the preferred service in for + * konq_mainwindow.cpp: Save and restore the preferred service in for each toolbar 'viewmode' button. 2000-12-10 David Faure <faure@kde.org> - * konq_mainwindow.cc, konq_view.*, browserextension.*: Fixed + * konq_mainwindow.cpp, konq_view.*, browserextension.*: Fixed the initial state of the common actions (cut,copy,paste etc.). Had to move all the handling of the action states to browserextension. @@ -203,7 +203,7 @@ 2000-12-08 David Faure <faure@kde.org> - * konq_mainwindow.cc (openURL): Support for about:blank + * konq_mainwindow.cpp (openURL): Support for about:blank Fix for severe problems with the activation of the standard actions. The state of the action is now stored in each KonqView. @@ -220,77 +220,77 @@ 2000-12-06 Matthias Elter <elter@kde.org> - * konq_mainwindow.cc: Turned the Configure submenu into a single dialog. + * konq_mainwindow.cpp: Turned the Configure submenu into a single dialog. 2000-12-02 David Faure <faure@kde.org> - * konq_mainwindow.cc (slotToolFind): "Find Files" now embeds the kfind + * konq_mainwindow.cpp (slotToolFind): "Find Files" now embeds the kfind part, and the result of the search is connected to the current directory part. "Close" or opening any other URL closes the 'find' part. Thanks to Eric Coquelle for the kfind classes, and to jpmartin for pushing us to do this :) - * konq_viewmgr.cc: Support for suicidal passive views, more arguments + * konq_viewmgr.cpp: Support for suicidal passive views, more arguments to splitView and splitWindow. - * konq_guiclients.cc: Duplicated code removed, uses splitWindow now. + * konq_guiclients.cpp: Duplicated code removed, uses splitWindow now. 2000-11-30 David Faure <faure@kde.org> - * konq_mainwindow.cc: Use current profile in "New Window" to fix #16283. + * konq_mainwindow.cpp: Use current profile in "New Window" to fix #16283. 2000-11-28 David Faure <faure@kde.org> - * konq_actions.cc: Accel (Alt+O in English) to give focus to location bar, + * konq_actions.cpp: Accel (Alt+O in English) to give focus to location bar, shown by the label. - * konq_profiledlg.cc: Ported to TDEListView to fix problems with selection. + * konq_profiledlg.cpp: Ported to TDEListView to fix problems with selection. 2000-11-26 David Faure <faure@kde.org> - * konq_misc.cc, kfmclient.cc, KonquerorIface.cc: Speed up for URLs opened + * konq_misc.cpp, kfmclient.cpp, KonquerorIface.cpp: Speed up for URLs opened from another process using KRun (e.g. kdesktop's Minicli), by passing the mimetype through to konqueror. 2000-11-25 David Faure <faure@kde.org> - * konq_misc.cc: Fixed location bar not showing the URL asap. + * konq_misc.cpp: Fixed location bar not showing the URL asap. - * konq_mainwindow.cc : Icons for the configure submenu. + * konq_mainwindow.cpp : Icons for the configure submenu. - * konq_actions.cc : KonqHistoryAction turned into TDEToolBarPopupAction. + * konq_actions.cpp : KonqHistoryAction turned into TDEToolBarPopupAction. Drag the "Location" label to start a drag with the current URL. 2000-11-25 Simon Hausmann <simon@kde.org> - * konq_view.cc (connectPart): Install new url event filter for plain + * konq_view.cpp (connectPart): Install new url event filter for plain krops and for browserviews with the enableURLDropHandling property enabled (eventFilter): New eventfilter which listens for url drop events Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <pfeiffer@kde.org> - * konq_mainwindow.cc: Completion handling overhauled. We have + * konq_mainwindow.cpp: Completion handling overhauled. We have one KonqHistoryManager, which holds a TDECompletion object and syncs the history with the completion. - * konq_view.cc: + * konq_view.cpp: set m_bAborted before calling slotCompleted in slotCanceled() feed the history manager - * konq_actions.cc: use KonqHistoryCombo that doesn't mess with the + * konq_actions.cpp: use KonqHistoryCombo that doesn't mess with the competion-object, we do our own synchronization now. * libkonq/ added konq_history* 2000-11-22 David Faure <faure@kde.org> - * konq_listview.cc: Added "Default" Icon Size, which corresponds to + * konq_listview.cpp: Added "Default" Icon Size, which corresponds to TDEIcon::Small (but when switching to icon view, it becomes whatever's configured for the "Desktop" group). 2000-11-21 David Faure <faure@kde.org> - * konq_listview.cc: Case Insensitive Sort option, on by default. + * konq_listview.cpp: Case Insensitive Sort option, on by default. * Views: Major rework of the "delayed mimetypes determination" feature, to make it available to the list view. This makes the list view @@ -303,30 +303,30 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <pfeiffer@kde.org> 2000-11-17 David Faure <faure@kde.org> - * konq_profiledlg.cc: Made checkbox states persistent (saved to config) + * konq_profiledlg.cpp: Made checkbox states persistent (saved to config) - * konq_run.cc: Check that when we call KRun from KonqRun, it's not going + * konq_run.cpp: Check that when we call KRun from KonqRun, it's not going to launch another konqueror. - * konq_guiclients.cc: Build toggle-view actions in the actioncollection + * konq_guiclients.cpp: Build toggle-view actions in the actioncollection of the mainwindow, so that it's possible to assign them a shortcut. 2000-11-16 David Faure <faure@kde.org> - * konq_viewmgr.cc: Patch by Keunwoo Lee <klee@cs.washington.edu> to + * konq_viewmgr.cpp: Patch by Keunwoo Lee <klee@cs.washington.edu> to implement dynamic accels for the profile submenu. 2000-11-15 David Faure <faure@kde.org> - * konq_drag.cc: Export URLs as text/plain as well. + * konq_drag.cpp: Export URLs as text/plain as well. - * konq_mainwindow.cc: Implemented auto-saving of toolbars (TDEMainWindow), + * konq_mainwindow.cpp: Implemented auto-saving of toolbars (TDEMainWindow), removed "Save Settings". Fixed "clicking on directory in dirtree uses wrong view mode for dirs". - * konq_iconview.cc: Added +/- buttons for changing the icon size. + * konq_iconview.cpp: Added +/- buttons for changing the icon size. 2000-11-06 David Faure <faure@kde.org> - * konq_operations.cc: statURL, calls a slot when it stat'ed + * konq_operations.cpp: statURL, calls a slot when it stat'ed the url and created a tdefileitem for it. Used in doDrop when the destination's tdefileitem is unknown. Fixes #14739. Also, KPropsDlg now does a similar thing when called with a KURL. @@ -336,30 +336,30 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <pfeiffer@kde.org> * konqueror.rc: Moved the "open with" actions to the Location menu, and added a separator to the action list. - * konq_view.cc (connectPart): moved call to setSaveViewPropertiesLocally + * konq_view.cpp (connectPart): moved call to setSaveViewPropertiesLocally (used to be in various places in KonqMW) so that the flag is also correct when switching views. - * konq_dirpart.cc and directory views: apply background color and pixmap + * konq_dirpart.cpp and directory views: apply background color and pixmap to the viewport(), and updated konq_iconview to do the same. This fixes many inconsistencies, and makes resizing a window much faster & smoother. Note that it has to be the viewport and not the widget, otherwise in the listview, the box between the scrollbars appears colored/pixmap-ed. - * konq_mainwindow.cc: action renamed View Properties Saved In Directory + * konq_mainwindow.cpp: action renamed View Properties Saved In Directory 2000-11-04 David Faure <faure@kde.org> - * konq_viewmgr.cc: now takes care of enableAllActions. + * konq_viewmgr.cpp: now takes care of enableAllActions. Show led and active statusbar even in the tree+icon configuration (the rule is now "more than one view", not "more than one activeable view"). This should remove some confusion. - * konq_frame.cc: "Remove View" in RMB on statusbar. + * konq_frame.cpp: "Remove View" in RMB on statusbar. Don't try to activate passive views when clicking statusbar. Different background color on statusbar for active view. - * konq_mainwindow.cc: Fixes for "Remove Active View" enabling, + * konq_mainwindow.cpp: Fixes for "Remove Active View" enabling, to avoid ending up with a lonely embedded konsole, and some cleanup of code for enabling other view-related actions. Introducing updateViewActions for common code between enableAllActions @@ -393,10 +393,10 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <pfeiffer@kde.org> 2000-10-22 David Faure <faure@kde.org> - * dirtree/konq_dirtree.cc: Fixed support for devices in the directory + * dirtree/konq_dirtree.cpp: Fixed support for devices in the directory tree. It currently requires MountPoint in the device desktop file. - * listview/konq_textviewwidget.cc: Only the Name column is now + * listview/konq_textviewwidget.cpp: Only the Name column is now selected, and used as a drop area - like in other listviews. This requires the fix in TDEListView to work properly. @@ -406,7 +406,7 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <pfeiffer@kde.org> 2000-10-20 David Faure <faure@kde.org> - * konq_misc.cc: Use webbrowsing profile for *.html *.htm as well. + * konq_misc.cpp: Use webbrowsing profile for *.html *.htm as well. 2000-10-20 Simon Hausmann <hausmann@kde.org> diff --git a/konqueror/Home.desktop b/konqueror/Home.desktop index 8e3a8d493..de9a75953 100644 --- a/konqueror/Home.desktop +++ b/konqueror/Home.desktop @@ -5,166 +5,8 @@ Icon=folder_home Terminal=false Name=Home -Name[af]=Tuiste -Name[ar]=المنزل -Name[az]=Başlanğıc -Name[be]=Хатняя тэчка -Name[bg]=Домашна директория -Name[bn]=ব্যক্তিগত ফোল্ডার -Name[br]=Er-gêr -Name[bs]=Početak -Name[ca]=Inici -Name[cs]=Můj adresář -Name[csb]=Dodóm -Name[cy]=Cartref -Name[da]=Hjem -Name[de]=Persönlicher Ordner -Name[el]=Προσωπικός φάκελος -Name[eo]=Hejmo -Name[es]=Personal -Name[et]=Kodu -Name[eu]=Etxea -Name[fa]=آغازه -Name[fi]=Koti -Name[fr]=Dossier personnel -Name[fy]=Thús -Name[ga]=Baile -Name[gl]=Persoal -Name[he]=בית -Name[hi]=घर -Name[hr]=Početak -Name[hu]=Saját könyvtár -Name[id]=Rumah -Name[is]=Heimasvæðið þitt -Name[ja]=ホーム -Name[ka]=სახლში -Name[kk]=Мекен -Name[km]=ផ្ទះ -Name[ko]=홈 -Name[lo]=ພື້ນທີ່ສ່ວນຕົວ -Name[lt]=Pradžia -Name[lv]=Mājas -Name[mk]=Дома -Name[mn]=Гэр -Name[ms]=Laman Utama -Name[mt]=Direttorju Personali -Name[nb]=Hjem -Name[nds]=Tohuus -Name[ne]=गृह -Name[nn]=Heim -Name[nso]=Gae -Name[oc]=Inici -Name[pa]=ਘਰ -Name[pl]=Katalog domowy -Name[pt]=Pasta Pessoal -Name[pt_BR]=Pasta do Usuário -Name[ro]=Acasă -Name[ru]=Домой -Name[rw]=Urugo -Name[se]=Ruoktu -Name[sk]=Domov -Name[sl]=Domov -Name[sr]=Домаће -Name[sr@Latn]=Domaće -Name[ss]=Ekhaya -Name[sv]=Hem -Name[ta]=தொடக்கம் -Name[te]=ఇల్లు -Name[tg]=Компютери Ман -Name[th]=พื้นที่ส่วนตัว -Name[tr]=Başlangıç -Name[tt]=Anabit -Name[uk]=Домівка -Name[uz]=Uy -Name[uz@cyrillic]=Уй -Name[ven]=Haya -Name[vi]=Nhà -Name[wa]=Måjhon -Name[xh]=Ikhaya -Name[zh_CN]=主文件夹 -Name[zh_TW]=家目錄 -Name[zu]=Ikhaya GenericName=Personal Files -GenericName[af]=Persoonlike Lêers -GenericName[ar]=الملفات الشخصية -GenericName[az]=Şəxsi Fayllar -GenericName[be]=Персанальныя файлы -GenericName[bg]=Лични файлове -GenericName[bn]=ব্যক্তিগত ফাইলসমূহ -GenericName[br]=Restroù deoc'h -GenericName[bs]=Osobne datoteke -GenericName[ca]=Fitxers personals -GenericName[cs]=Osobní soubory -GenericName[csb]=Swòje lopczi -GenericName[cy]=Ffeiliau Personol -GenericName[da]=Personlige filer -GenericName[de]=Eigene Dateien -GenericName[el]=Προσωπικά αρχεία -GenericName[eo]=Personaj dosieroj -GenericName[es]=Archivos personales -GenericName[et]=Isiklikud failid -GenericName[eu]=Fitxategi pertsonalak -GenericName[fa]=پروندههای شخصی -GenericName[fi]=Omat tiedostot -GenericName[fr]=Fichiers personnels -GenericName[fy]=Persoanlike map -GenericName[ga]=Comhaid Phearsanta -GenericName[gl]=Ficheiros Persoais -GenericName[he]=קבצים אישיים -GenericName[hi]=निजी फ़ाइलें -GenericName[hr]=Osobne datoteke -GenericName[hu]=Személyes fájlok -GenericName[id]=File Pribadi -GenericName[is]=Skrárnar þínar -GenericName[it]=File personali -GenericName[ja]=個人のファイル -GenericName[ka]=პირადი საქაღალდეები -GenericName[kk]=Дербес файлдар -GenericName[km]=ឯកសារផ្ទាល់ខ្លួន -GenericName[ko]=개인적인 파일 -GenericName[lo]=ທີ່ເກັບແຟ້ມແລະເອກະສານສວ່ນຕົວຫລືອື່ນຯ -GenericName[lt]=Asmeninės bylos -GenericName[lv]=Personālie Faili -GenericName[mk]=Лични датотеки -GenericName[mn]=Өөрийн файлууд -GenericName[ms]=Fail Peribadi -GenericName[mt]=Fajls Personali -GenericName[nb]=Personlige filer -GenericName[nds]=De egen Dateien -GenericName[ne]=व्यक्तिगत फाइल -GenericName[nl]=Persoonlijke map -GenericName[nn]=Personlege filer -GenericName[nso]=Difaele tsa Botho -GenericName[oc]=FiquièRs personals -GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲ਼ਾਂ -GenericName[pl]=Pliki osobiste -GenericName[pt]=Ficheiros Pessoais -GenericName[pt_BR]=Arquivos Pessoais -GenericName[ro]=Fișiere personale -GenericName[ru]=Личные файлы -GenericName[rw]=Amadosiye Yihariye -GenericName[se]=Iežat fiillat -GenericName[sk]=Osobné súbory -GenericName[sl]=Osebne datoteke -GenericName[sr]=Лични фајлови -GenericName[sr@Latn]=Lični fajlovi -GenericName[sv]=Personliga filer -GenericName[ta]=சொந்த கோப்புகள் -GenericName[te]=వ్యక్తిగత దస్త్రాలు -GenericName[tg]=Файлҳои шахсӣ -GenericName[th]=แฟ้มส่วนตัว -GenericName[tr]=Kişisel Dosyalar -GenericName[tt]=Şäxsi Biremnär -GenericName[uk]=Особисті файли -GenericName[uz]=Shaxsiy fayllar -GenericName[uz@cyrillic]=Шахсий файллар -GenericName[ven]=Dzifaela dza vhune -GenericName[vi]=Tập tin Cá nhân -GenericName[wa]=Fitchîs da vosse -GenericName[xh]=Iifayile Zobuqu -GenericName[zh_CN]=个人文件 -GenericName[zh_TW]=個人檔案 -GenericName[zu]=Amafayela Omuntu siqu + Categories=Qt;TDE;Core; OnlyShowIn=TDE; diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cpp index a18301a2f..5f3cbd14f 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/konqueror/KonqMainWindowIface.cpp @@ -153,13 +153,13 @@ TQMap<TQCString,DCOPRef> KonqMainWindowIface::actionMap() QCStringList KonqMainWindowIface::functionsDynamic() { - return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( TQT_TQOBJECT(m_pMainWindow) ); + return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow ); } bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData ) { - if ( KDCOPPropertyProxy::isPropertyRequest( fun, TQT_TQOBJECT(m_pMainWindow) ) ) - return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, TQT_TQOBJECT(m_pMainWindow) ); + if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) ) + return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow ); return DCOPObject::processDynamic( fun, data, replyType, replyData ); } diff --git a/konqueror/KonqViewIface.cc b/konqueror/KonqViewIface.cpp index 77bfbb61c..77bfbb61c 100644 --- a/konqueror/KonqViewIface.cc +++ b/konqueror/KonqViewIface.cpp diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cpp index cd3ed7591..db87e39ed 100644 --- a/konqueror/KonquerorIface.cc +++ b/konqueror/KonquerorIface.cpp @@ -51,7 +51,7 @@ KonquerorIface::~KonquerorIface() DCOPRef KonquerorIface::openBrowserWindow( const TQString &url ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) ); if ( !res ) return DCOPRef(); @@ -77,7 +77,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect ); if ( !res ) return DCOPRef(); @@ -92,7 +92,7 @@ DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQ DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mimetype, bool tempFile ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KParts::URLArgs args; args.serviceType = mimetype; // Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running @@ -112,7 +112,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) " << endl; kdDebug(1202) << path << endl; KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, TQString::null ); @@ -129,7 +129,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, const TQString &filename ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl; kdDebug(1202) << path << "," << filename << endl; KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename ); @@ -147,7 +147,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & path, const TQString &filename, const TQString &url ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) ); if ( !res ) return DCOPRef(); @@ -163,7 +163,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KParts::URLArgs args; args.serviceType = mimetype; KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url), args ); @@ -254,7 +254,7 @@ bool KonquerorIface::processCanBeReused( int screen ) if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" )) { allowed_parts.clear(); - // is duplicated in client/kfmclient.cc + // is duplicated in client/kfmclient.cpp allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) << TQString::fromLatin1( "konq_multicolumnview.desktop" ) << TQString::fromLatin1( "konq_sidebartng.desktop" ) diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am index e84ddffcf..a81cabe84 100644 --- a/konqueror/Makefile.am +++ b/konqueror/Makefile.am @@ -22,23 +22,23 @@ METASOURCES = AUTO include_HEADERS = KonquerorIface.h libkonqueror_intern_la_SOURCES = konq_settingsxt.kcfgc -konqueror_la_SOURCES = konq_main.cc \ - KonquerorIface.cc KonquerorIface.skel \ - KonqMainWindowIface.cc KonqMainWindowIface.skel \ - KonqViewIface.cc KonqViewIface.skel \ - konq_guiclients.cc \ - konq_run.cc konq_view.cc konq_viewmgr.cc \ - konq_misc.cc \ - konq_frame.cc \ - konq_tabs.cc \ - konq_actions.cc \ - konq_profiledlg.cc \ - konq_factory.cc \ - konq_combo.cc \ - konq_browseriface.cc \ - delayedinitializer.cc \ - konq_mainwindow.cc \ - konq_extensionmanager.cc +konqueror_la_SOURCES = konq_main.cpp \ + KonquerorIface.cpp KonquerorIface.skel \ + KonqMainWindowIface.cpp KonqMainWindowIface.skel \ + KonqViewIface.cpp KonqViewIface.skel \ + konq_guiclients.cpp \ + konq_run.cpp konq_view.cpp konq_viewmgr.cpp \ + konq_misc.cpp \ + konq_frame.cpp \ + konq_tabs.cpp \ + konq_actions.cpp \ + konq_profiledlg.cpp \ + konq_factory.cpp \ + konq_combo.cpp \ + konq_browseriface.cpp \ + delayedinitializer.cpp \ + konq_mainwindow.cpp \ + konq_extensionmanager.cpp konqueror_la_PCH = AUTO @@ -59,14 +59,14 @@ konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) # and make clean ; make konqueror_static in here. #check_PROGRAMS = konqueror_static # -#konqueror_static_SOURCES = dummy.cc +#konqueror_static_SOURCES = dummy.cpp #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libtdehtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static messages: rc.cpp $(EXTRACTRC) *.rc */*.rc >> rc.cpp $(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp - $(XGETTEXT) -kaliasLocal rc.cpp *.h *.cc *view/*h *view/*cc kedit*/*.h kedit*/*.cpp about/*.h about/*.cc remoteencodingplugin/*.cpp remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"` `find sidebar -name "*.h"` -o $(podir)/konqueror.pot + $(XGETTEXT) -kaliasLocal rc.cpp *.h *.cpp *view/*h *view/*.cpp kedit*/*.h kedit*/*.cpp about/*.h about/*.cpp remoteencodingplugin/*.cpp remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"` `find sidebar -name "*.h"` -o $(podir)/konqueror.pot xdg_apps_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop \ kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop diff --git a/konqueror/about/CMakeLists.txt b/konqueror/about/CMakeLists.txt index 5eb9cc0f6..ffa5d4b96 100644 --- a/konqueror/about/CMakeLists.txt +++ b/konqueror/about/CMakeLists.txt @@ -23,8 +23,17 @@ link_directories( ##### other data ################################ -install( FILES konq_aboutpage.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES konqaboutpage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE konq_aboutpage.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR konqueror-desktops +) + +tde_create_translated_desktop( + SOURCE konqaboutpage.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR konqueror-desktops +) install( FILES box-centre-konqueror.png top-right-konqueror.png @@ -38,7 +47,7 @@ install( FILES set( target konq_aboutpage ) tde_add_kpart( ${target} AUTOMOC - SOURCES konq_aboutpage.cc + SOURCES konq_aboutpage.cpp LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/about/Makefile.am b/konqueror/about/Makefile.am index 0a33f9bb7..f4ede2182 100644 --- a/konqueror/about/Makefile.am +++ b/konqueror/about/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = konq_aboutpage.la INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/libkonq $(all_includes) -konq_aboutpage_la_SOURCES = konq_aboutpage.cc +konq_aboutpage_la_SOURCES = konq_aboutpage.cpp konq_aboutpage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module konq_aboutpage_la_LIBADD = $(LIB_TDEHTML) diff --git a/konqueror/about/intro.html b/konqueror/about/intro.html index efa4d62a9..d9a2943cc 100644 --- a/konqueror/about/intro.html +++ b/konqueror/about/intro.html @@ -87,4 +87,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cpp index cb2149f90..a18aa3eda 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cpp @@ -54,7 +54,7 @@ KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, co TQObject *parent, const char *name, const char *, const TQStringList & ) { - //KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( parentWidget ); + //KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget ); //if ( !frame ) return 0; return new KonqAboutPage( //frame->childView()->mainWindow(), diff --git a/konqueror/about/konq_aboutpage.desktop b/konqueror/about/konq_aboutpage.desktop index da91b3a67..5b9b8f0c7 100644 --- a/konqueror/about/konq_aboutpage.desktop +++ b/konqueror/about/konq_aboutpage.desktop @@ -1,85 +1,6 @@ [Desktop Entry] Type=Service Name=About-Page for Konqueror -Name[af]=About-Page vir Konqueror -Name[ar]=ضفحة حول لِــ Konqueror -Name[az]=Konqueror Haqqında Səhifəsi -Name[be]=Інфармацыйная старонка Konqueror -Name[bg]=Страница с информация за Konqueror -Name[bn]=কনকরার পরিচিতি পৃষ্ঠা -Name[br]=Pajenn diwar-benn Konqueror -Name[bs]=About-stranica za Konqueror -Name[ca]=Pàgina quant al Konqueror -Name[cs]=O aplikaci Konqueror -Name[csb]=Starna "Ò programie" Konquerora -Name[cy]=Tudalen Ynghylch i Konqueror -Name[da]='Om'-side for Konqueror -Name[de]=Über Konqueror -Name[el]=Σελίδα πληροφοριών για τον Konqueror -Name[eo]=Informpaĝo por Konkeranto -Name[es]=Página 'Acerca de' para Konqueror -Name[et]=Konquerori info -Name[eu]='Honi buruzko orria' Konquerorrerako -Name[fa]=صفحۀ درباره برای Konqueror -Name[fi]=Konquerorin tietoja-sivu -Name[fr]=À propos de Konqueror -Name[fy]=Ynformaasjeside foar Konqueror -Name[ga]=Leathanach Eolais le haghaidh Konqueror -Name[gl]=Páxina Acerca de Konqueror -Name[he]=דף אודות Konqueror -Name[hi]=के-बारे में पृष्ठ कॉन्करर के लिए -Name[hr]=O programu Konqueror -Name[hu]=A Konqueror névjegye -Name[id]=Tentang halaman untuk Konqueror -Name[is]=Upplýsingasíða Konqueror -Name[it]=Pagina di informazioni di Konqueror -Name[ja]=Konqueror のバージョン情報ページ -Name[ka]=Konqueror-ის ცნობათა ფურცელი -Name[kk]=Konqueror туралы парақ -Name[km]=ទំព័រអំពី របស់ Konqueror -Name[ko]=Konqueror 정보 페이지 -Name[lo]=ຫນ້າກ່ງວກັບສຳລັບ Konqueror -Name[lt]=Apie Konqueror -Name[lv]=Par-Lapa priekš Iekarotāja -Name[mk]=Страница за Konqueror -Name[mn]=Конкюрорын тухай -Name[ms]=Tentang Halaman untuk Konqueror -Name[mt]=Paġna dwar Konqueror -Name[nb]=Om-side for Konqueror -Name[nds]=Infosiet över Konqueror -Name[ne]=कन्क्वेररका लागि पृष्ठका बारेमा -Name[nl]=Informatiepagina voor Konqueror -Name[nn]=Om-side Konqueror -Name[nso]=Kaga letlakala la Konqueror -Name[pa]=ਕੋਨਕਿਉਰੋਰ ਬਾਰੇ ਸਫਾ -Name[pl]=Strona "O programie" Konquerora -Name[pt]=Página Acerca do Konqueror -Name[pt_BR]=Página "Sobre" do Konqueror -Name[ro]=Pagină informații pentru Konqueror -Name[ru]=Страница сведений о Konqueror -Name[rw]=Ibijyanye-Ipaji ya Konqueror -Name[se]=Diehtusiidu Konqueror várás -Name[sk]=Stránka o programe Konqueror -Name[sl]=Stran o Konquerorju -Name[sr]=Информативна страница о Konqueror-у -Name[sr@Latn]=Informativna stranica o Konqueror-u -Name[sv]=Om-sida för Konqueror -Name[ta]=கான்கொரர்க்கான பக்கம்-பற்றி -Name[te]=కాంకెరర్ కొరకు గురించి పుట -Name[tg]=Саҳифаи маълумот дар бораи Konqueror -Name[th]=หน้าเกี่ยวกับคอนเควอร์เรอร์ -Name[tr]=Konqueror Hakkında Sayfası -Name[tt]=Konqueror Turında -Name[uk]=Сторінка "Про" для Konqueror -Name[uz]=Konqueror haqida sahifa -Name[uz@cyrillic]=Konqueror ҳақида саҳифа -Name[ven]=Nga ha siatari la Konqueror -Name[vi]=Trang giới thiệu của Konqueror -Name[wa]=Pådje åd fait di Konqueror -Name[xh]=Malunga-Nephepha le Konqueror -Name[zh_CN]=Konqueror 的关于页面 -Name[zh_TW]=Konqueror 相關資訊 -Name[zu]=Mayelana-nekhasi le-Konqueror X-TDE-ServiceTypes=KonqAboutPage,KParts/ReadOnlyPart X-TDE-Library=konq_aboutpage X-TDE-BrowserView-HideFromMenus=true diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index a4192d570..1c359a89e 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -34,7 +34,7 @@ private: class KonqAboutPage : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: KonqAboutPage( /*KonqMainWindow *mainWindow,*/ TQWidget *parentWidget, const char *widgetName, diff --git a/konqueror/about/launch.html b/konqueror/about/launch.html index 6e84049a7..a9d569350 100644 --- a/konqueror/about/launch.html +++ b/konqueror/about/launch.html @@ -131,4 +131,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html index 752c162da..be40c90bb 100644 --- a/konqueror/about/specs.html +++ b/konqueror/about/specs.html @@ -204,4 +204,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/konqueror/about/tips.html b/konqueror/about/tips.html index cf4a37862..085b630a8 100644 --- a/konqueror/about/tips.html +++ b/konqueror/about/tips.html @@ -124,4 +124,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt index 3ae477d32..fe45ce141 100644 --- a/konqueror/client/CMakeLists.txt +++ b/konqueror/client/CMakeLists.txt @@ -32,7 +32,7 @@ install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/tdecon set( target kfmclient ) set( ${target}_SRCS - kfmclient.cc + kfmclient.cpp ${CMAKE_SOURCE_DIR}/konqueror/KonquerorIface.stub ${CMAKE_SOURCE_DIR}/kdesktop/KDesktopIface.stub ) diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am index c66ed555c..872951b4e 100644 --- a/konqueror/client/Makefile.am +++ b/konqueror/client/Makefile.am @@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = kfmclient.la INCLUDES= -I.. $(all_includes) kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version kfmclient_la_LIBADD = $(LIB_TDEIO) -kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub +kfmclient_la_SOURCES = kfmclient.cpp KonquerorIface.stub KDesktopIface.stub noinst_HEADERS = kfmclient.h METASOURCES = AUTO @@ -16,7 +16,7 @@ KonquerorIface_DIR = $(srcdir)/.. KDesktopIface_DIR = $(top_srcdir)/kdesktop messages: - $(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot + $(XGETTEXT) -kaliasLocal *.h *.cpp -o $(podir)/kfmclient.pot updatedir = $(kde_datadir)/tdeconf_update update_DATA = kfmclient_3_2.upd diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cpp index c0f0c5c69..001734cdb 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cpp @@ -181,7 +181,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); TQStringList allowed_parts; - // is duplicated in ../KonquerorIface.cc + // is duplicated in ../KonquerorIface.cpp allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) << TQString::fromLatin1( "konq_multicolumnview.desktop" ) << TQString::fromLatin1( "konq_sidebartng.desktop" ) @@ -323,8 +323,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co TDEStartupInfo::appStarted(); KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor] - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -423,7 +423,7 @@ void clientApp::delayedQuit() { // Quit in 2 seconds. This leaves time for KRun to pop up // "app not found" in TDEProcessRunner, if that was the case. - TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(deref()) ); // don't access the KRun instance later, it will be deleted after calling slots if( static_cast< const KRun* >( sender())->hasError()) krun_has_error = true; @@ -504,8 +504,8 @@ bool clientApp::doIt() { checkArgumentCount(argc, 2, 2); KPropertiesDialog * p = new KPropertiesDialog( args->url(1) ); - TQObject::connect( p, TQT_SIGNAL( destroyed() ), &app, TQT_SLOT( quit() )); - TQObject::connect( p, TQT_SIGNAL( canceled() ), &app, TQT_SLOT( slotDialogCanceled() )); + TQObject::connect( p, TQ_SIGNAL( destroyed() ), &app, TQ_SLOT( quit() )); + TQObject::connect( p, TQ_SIGNAL( canceled() ), &app, TQ_SLOT( slotDialogCanceled() )); app.exec(); return m_ok; } @@ -520,8 +520,8 @@ bool clientApp::doIt() else if ( argc == 2 ) { KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -538,8 +538,8 @@ bool clientApp::doIt() else if ( command == "openBrowser" ) { KRun * run = new KRun( "http://default.browser", 0, 0, false, false /* no progress window */ ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -553,7 +553,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::move( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -588,7 +588,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::copy( srcLst, dsturl ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -602,7 +602,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::copy( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h index 1e17279c6..f46f3d06f 100644 --- a/konqueror/client/kfmclient.h +++ b/konqueror/client/kfmclient.h @@ -25,7 +25,7 @@ class clientApp : public TDEApplication { - Q_OBJECT + TQ_OBJECT public: /** Parse command-line arguments and "do it" */ static bool doIt(); diff --git a/konqueror/delayedinitializer.cc b/konqueror/delayedinitializer.cpp index c8ab89722..a635fb1ac 100644 --- a/konqueror/delayedinitializer.cc +++ b/konqueror/delayedinitializer.cpp @@ -38,7 +38,7 @@ bool DelayedInitializer::eventFilter( TQObject *receiver, TQEvent *event ) // Move the emitting of the event to the end of the eventQueue // so we are absolutely sure the event we get here is handled before // the initialize is fired. - TQTimer::singleShot( 0, this, TQT_SLOT( slotInitialize() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotInitialize() ) ); return false; } @@ -50,6 +50,3 @@ void DelayedInitializer::slotInitialize() } #include "delayedinitializer.moc" - -/* vim: et sw=4 - */ diff --git a/konqueror/delayedinitializer.h b/konqueror/delayedinitializer.h index a9119ba58..c52fe04b0 100644 --- a/konqueror/delayedinitializer.h +++ b/konqueror/delayedinitializer.h @@ -24,7 +24,7 @@ class DelayedInitializer : public TQObject { - Q_OBJECT + TQ_OBJECT public: DelayedInitializer( int eventType, TQObject *parent, const char *name = 0 ); @@ -41,5 +41,3 @@ private: }; #endif -/* vim: et sw=4 - */ diff --git a/konqueror/iconview/CMakeLists.txt b/konqueror/iconview/CMakeLists.txt index d3fa80c56..f308f226a 100644 --- a/konqueror/iconview/CMakeLists.txt +++ b/konqueror/iconview/CMakeLists.txt @@ -25,7 +25,12 @@ link_directories( ##### other data ################################ -install( FILES konq_iconview.desktop konq_multicolumnview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE konq_iconview.desktop konq_multicolumnview.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR konqueror-desktops +) + install( FILES konq_iconview.rc konq_multicolumnview.rc DESTINATION ${DATA_INSTALL_DIR}/konqiconview ) @@ -34,7 +39,7 @@ install( FILES konq_iconview.rc konq_multicolumnview.rc DESTINATION ${DATA_INSTA set( target konq_iconview ) tde_add_kpart( ${target} AUTOMOC - SOURCES konq_iconview.cc + SOURCES konq_iconview.cpp LINK konq-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/iconview/Makefile.am b/konqueror/iconview/Makefile.am index bc685d997..34b4f31a8 100644 --- a/konqueror/iconview/Makefile.am +++ b/konqueror/iconview/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = konq_iconview.la METASOURCES = AUTO -konq_iconview_la_SOURCES = konq_iconview.cc +konq_iconview_la_SOURCES = konq_iconview.cpp konq_iconview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module konq_iconview_la_LIBADD = $(top_builddir)/libkonq/libkonq.la diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cpp index 5efc1e751..04b973f8f 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cpp @@ -184,22 +184,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" ); m_pIconView->initConfig( true ); - connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()), - this, TQT_SLOT(slotRenderingFinished())); + connect( m_pIconView, TQ_SIGNAL(imagePreviewFinished()), + this, TQ_SLOT(slotRenderingFinished())); // connect up the icon inc/dec signals - connect( m_pIconView, TQT_SIGNAL(incIconSize()), - this, TQT_SLOT(slotIncIconSize())); - connect( m_pIconView, TQT_SIGNAL(decIconSize()), - this, TQT_SLOT(slotDecIconSize())); + connect( m_pIconView, TQ_SIGNAL(incIconSize()), + this, TQ_SLOT(slotIncIconSize())); + connect( m_pIconView, TQ_SIGNAL(decIconSize()), + this, TQ_SLOT(slotDecIconSize())); // pass signals to the extension - connect( m_pIconView, TQT_SIGNAL( enableAction( const char *, bool ) ), - m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( enableAction( const char *, bool ) ), + m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) ); // signals from konqdirpart (for BC reasons) - connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); - connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); + connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) ); + connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) ); setWidget( m_pIconView ); m_mimeTypeResolver = new KMimeTypeResolver<KFileIVI,KonqKfmIconView>(this); @@ -211,22 +211,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // Don't repaint on configuration changes during construction m_bInit = true; - m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), + m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files")); m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) ); - m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ), + m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQ_SLOT( slotShowDirectoryOverlays() ), actionCollection(), "show_directory_overlays" ); - m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQT_SLOT( slotShowFreeSpaceOverlays() ), + m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQ_SLOT( slotShowFreeSpaceOverlays() ), actionCollection(), "show_free_space_overlays" ); m_pamPreview = new TDEActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" ); m_paEnablePreviews = new TDEToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" ); m_paEnablePreviews->setCheckedState( i18n("Disable Previews") ); - connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( m_paEnablePreviews, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_paEnablePreviews->setIcon("thumbnail"); m_pamPreview->insert( m_paEnablePreviews ); m_pamPreview->insert( new TDEActionSeparator(this) ); @@ -240,13 +240,13 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons else { preview = new TDEToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() ); - connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( preview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( preview ); m_paPreviewPlugins.append( preview ); } } TDEToggleAction *soundPreview = new TDEToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" ); - connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( soundPreview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( soundPreview ); m_paPreviewPlugins.append( soundPreview ); @@ -270,15 +270,15 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons aSortByType->setChecked( false ); aSortByDate->setChecked( false ); - connect( aSortByNameCS, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseSensitive( bool ) ) ); - connect( aSortByNameCI, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseInsensitive( bool ) ) ); - connect( aSortBySize, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortBySize( bool ) ) ); - connect( aSortByType, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByType( bool ) ) ); - connect( aSortByDate, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByDate( bool ) ) ); + connect( aSortByNameCS, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseSensitive( bool ) ) ); + connect( aSortByNameCI, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseInsensitive( bool ) ) ); + connect( aSortBySize, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortBySize( bool ) ) ); + connect( aSortByType, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByType( bool ) ) ); + connect( aSortByDate, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByDate( bool ) ) ); //enable menu item representing the saved sorting criterion TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); - TDERadioAction *sort_action = tqt_dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1())); + TDERadioAction *sort_action = dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1())); if(sort_action!=NULL) sort_action->activate(); m_paSortDirsFirst = new TDEToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" ); @@ -286,8 +286,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() ); - connect( aSortDescending, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDescending() ) ); - connect( m_paSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDirsFirst() ) ); + connect( aSortDescending, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDescending() ) ); + connect( m_paSortDirsFirst, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDirsFirst() ) ); //enable stored settings slotSortDirsFirst(); @@ -307,15 +307,15 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_pamSort->insert( aSortDescending ); */ - m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), + m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, - this, TQT_SLOT( slotInvertSelection() ), + this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) ); @@ -328,67 +328,65 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons //m_paRightText = new TDEToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" ); //m_paBottomText->setExclusiveGroup( "TextPos" ); //m_paRightText->setExclusiveGroup( "TextPos" ); - //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) ); - //connect( m_paRightText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextRight( bool ) ) ); + //connect( m_paBottomText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextBottom( bool ) ) ); + //connect( m_paRightText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextRight( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem * ) ), - this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), - this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem * ) ), + this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), + this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); + connect( m_pIconView, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); - connect( m_pIconView, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); - connect( m_pIconView, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) ); - connect( m_pIconView, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); - connect( m_pIconView, TQT_SIGNAL( mouseDoubleClicked(TQIconViewItem*)), - this, TQT_SLOT( slotDoubleClicked(TQIconViewItem*)) ); + connect( m_pIconView, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); // Signals needed to implement the spring loading folders behavior - connect( m_pIconView, TQT_SIGNAL( held( TQIconViewItem * ) ), - this, TQT_SLOT( slotDragHeld( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragEntered( bool ) ), - this, TQT_SLOT( slotDragEntered( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragLeft() ), - this, TQT_SLOT( slotDragLeft() ) ); - connect( m_pIconView, TQT_SIGNAL( dragMove( bool ) ), - this, TQT_SLOT( slotDragMove( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragFinished() ), - this, TQT_SLOT( slotDragFinished() ) ); + connect( m_pIconView, TQ_SIGNAL( held( TQIconViewItem * ) ), + this, TQ_SLOT( slotDragHeld( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragEntered( bool ) ), + this, TQ_SLOT( slotDragEntered( bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragLeft() ), + this, TQ_SLOT( slotDragLeft() ) ); + connect( m_pIconView, TQ_SIGNAL( dragMove( bool ) ), + this, TQ_SLOT( slotDragMove( bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragFinished() ), + this, TQ_SLOT( slotDragFinished() ) ); // Create the directory lister m_dirLister = new KDirLister( true ); setDirLister( m_dirLister ); m_dirLister->setMainWindow(m_pIconView->topLevelWidget()); - connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), - this, TQT_SLOT( slotStarted() ) ); - connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); - connect( m_dirLister, TQT_SIGNAL( canceled( const KURL& ) ), this, TQT_SLOT( slotCanceled( const KURL& ) ) ); - connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) ); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList& ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ), - TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( infoMessage( const TQString& ) ), - extension(), TQT_SIGNAL( infoMessage( const TQString& ) ) ); - connect( m_dirLister, TQT_SIGNAL( percent( int ) ), - extension(), TQT_SIGNAL( loadingProgress( int ) ) ); - connect( m_dirLister, TQT_SIGNAL( speed( int ) ), - extension(), TQT_SIGNAL( speedProgress( int ) ) ); + connect( m_dirLister, TQ_SIGNAL( started( const KURL & ) ), + this, TQ_SLOT( slotStarted() ) ); + connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) ); + connect( m_dirLister, TQ_SIGNAL( canceled( const KURL& ) ), this, TQ_SLOT( slotCanceled( const KURL& ) ) ); + connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( slotClear() ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList& ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ), + TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( infoMessage( const TQString& ) ), + extension(), TQ_SIGNAL( infoMessage( const TQString& ) ) ); + connect( m_dirLister, TQ_SIGNAL( percent( int ) ), + extension(), TQ_SIGNAL( loadingProgress( int ) ) ); + connect( m_dirLister, TQ_SIGNAL( speed( int ) ), + extension(), TQ_SIGNAL( speedProgress( int ) ) ); // Now we may react to configuration changes m_bInit = false; @@ -401,8 +399,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_bPreviewRunningBeforeCloseURL = false; m_pIconView->setResizeMode( TQIconView::Adjust ); - connect( m_pIconView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( m_pIconView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); // Respect kcmkonq's configuration for word-wrap icon text. // If we want something else, we have to adapt the configuration or remove it... @@ -412,6 +410,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // m_pIconView->calculateGridX(); setViewMode( mode ); + + m_pActivateDoubleClickTimer = new TQTimer(this); } KonqKfmIconView::~KonqKfmIconView() @@ -427,6 +427,13 @@ KonqKfmIconView::~KonqKfmIconView() delete m_pProps; //no need for that, KParts deletes our widget already ;-) // delete m_pIconView; + m_pActivateDoubleClickTimer->stop(); + delete m_pActivateDoubleClickTimer; + if (m_pTimeoutRefreshTimer) + { + m_pTimeoutRefreshTimer->stop(); + delete m_pTimeoutRefreshTimer; + } } const KFileItem * KonqKfmIconView::currentItem() @@ -436,7 +443,7 @@ const KFileItem * KonqKfmIconView::currentItem() void KonqKfmIconView::slotPreview( bool toggle ) { - TQCString name = TQT_TQOBJECT_CONST(sender())->name(); // e.g. clipartthumbnail (or audio/, special case) + TQCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case) if (name == "iconview_preview_all") { m_pProps->setShowingPreview( toggle ); @@ -832,7 +839,7 @@ void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPo void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&) { - if ( _button == Qt::RightButton && !_item ) + if ( _button == TQt::RightButton && !_item ) { // Right click on viewport KFileItem * item = m_dirLister->rootItem(); @@ -869,21 +876,40 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& ) { - if( _button == Qt::MidButton ) + if (_button == TQt::MidButton) + { mmbClicked( _item ? static_cast<KFileIVI*>(_item)->item() : 0L ); + } + else if (!_item && _button == TQt::LeftButton) + { + if (m_pActivateDoubleClickTimer->isActive()) + { + m_pActivateDoubleClickTimer->stop(); + slotDoubleClicked(_item); + } + else + { + m_pActivateDoubleClickTimer->start(TQApplication::doubleClickInterval(), true); + } + } } void KonqKfmIconView::slotDoubleClicked(TQIconViewItem *_item) { - if (!_item) + if (!_item && KonqFMSettings::settings()->doubleClickMoveToParent()) { KParts::URLArgs args; args.trustedSource = true; - KURL upURL = m_dirLister->url().upURL(); + KURL baseURL(m_dirLister->url().internalReferenceURL()); + if (baseURL.isEmpty()) + { + baseURL = m_dirLister->url(); + } + KURL upURL = baseURL.upURL(); if (!upURL.isEmpty()) - { - m_extension->openURLRequest(upURL, args); - } + { + m_extension->openURLRequest(upURL, args); + } } } @@ -1124,8 +1150,8 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item) if (!m_paOutstandingOverlaysTimer) { m_paOutstandingOverlaysTimer = new TQTimer(this); - connect(m_paOutstandingOverlaysTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotDirectoryOverlayStart())); + connect(m_paOutstandingOverlaysTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotDirectoryOverlayStart())); } m_paOutstandingOverlaysTimer->start(20, true); } @@ -1140,8 +1166,8 @@ void KonqKfmIconView::showFreeSpaceOverlay(KFileIVI* item) if (!m_paOutstandingFreeSpaceOverlaysTimer) { m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this); - connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotFreeSpaceOverlayStart())); + connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotFreeSpaceOverlayStart())); } m_paOutstandingFreeSpaceOverlaysTimer->start(20, true); } @@ -1159,7 +1185,7 @@ void KonqKfmIconView::slotDirectoryOverlayStart() if (overlay) { - connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDirectoryOverlayFinished() ) ); + connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDirectoryOverlayFinished() ) ); overlay->start(); // Watch out, may emit finished() immediately!! return; // Let it run.... } @@ -1179,7 +1205,7 @@ void KonqKfmIconView::slotFreeSpaceOverlayStart() if (overlay) { - connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) ); + connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) ); overlay->start(); // Watch out, may emit finished() immediately!! return; // Let it run.... } @@ -1269,8 +1295,8 @@ void KonqKfmIconView::slotClear() if ( !m_pTimeoutRefreshTimer ) { m_pTimeoutRefreshTimer = new TQTimer( this ); - connect( m_pTimeoutRefreshTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRefreshViewport() ) ); + connect( m_pTimeoutRefreshTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRefreshViewport() ) ); } m_pTimeoutRefreshTimer->start( 700, true ); @@ -1549,8 +1575,8 @@ static KStaticDeleter<SpringLoadingManager> s_springManagerDeleter; SpringLoadingManager::SpringLoadingManager() : m_startPart(0L) { - connect( &m_endTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( finished() ) ); + connect( &m_endTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( finished() ) ); } diff --git a/konqueror/iconview/konq_iconview.desktop b/konqueror/iconview/konq_iconview.desktop index 524efb6d6..1b741751e 100644 --- a/konqueror/iconview/konq_iconview.desktop +++ b/konqueror/iconview/konq_iconview.desktop @@ -1,84 +1,6 @@ [Desktop Entry] Type=Service Name=Icon View -Name[af]=Ikoon Besigtig -Name[ar]=عرض أيقوني -Name[az]=Timsal Görünüşü -Name[be]=Значкі -Name[bg]=Преглед с икони -Name[bn]=আইকন ভিউ -Name[br]=Gwel Arlun -Name[bs]=Ikone -Name[ca]=Vista d'icones -Name[cs]=Pohled s ikonami -Name[csb]=Wëzdrzatk ikònów -Name[cy]=Golwg Eicon -Name[da]=Ikonvisning -Name[de]=Symbolansicht -Name[el]=Προβολή εικονιδίων -Name[eo]=Piktogramrigardo -Name[es]=Vista de iconos -Name[et]=Vaade ikoonidena -Name[eu]=Koadro txikidun ikuspegia -Name[fa]=شمایلنما -Name[fi]=Kuvakenäkymä -Name[fr]=Icônes -Name[fy]=Byldkaike werjefte -Name[ga]=Amharc Deilbhíní -Name[gl]=Vista en Iconas -Name[he]=תצוגת סמלים -Name[hi]=प्रतीक दृश्य -Name[hr]=Prikaz ikona -Name[hu]=Ikonos -Name[id]=Tampilan Ikon -Name[is]=Táknmyndasýn -Name[it]=Vista a icone -Name[ja]=アイコンビュー -Name[ka]=ხატულებით ჩვენება -Name[kk]=Таңбаша түрінде -Name[km]=ទិដ្ឋភាពរូបតំណាង -Name[lo]=ມຸມມອງແບບໄອຄອນ -Name[lt]=Rodyti ženkliukus -Name[lv]=Ikonu Skatījums -Name[mk]=Приказ со икони -Name[mn]=Тэмдэгээр харах -Name[ms]=Paparan Ikon -Name[mt]=Ikoni -Name[nb]=Ikonvisning -Name[nds]=Lüttbildansicht -Name[ne]=प्रतिमा दृश्य -Name[nl]=Pictogramweergave -Name[nn]=Ikon-vising -Name[nso]=Pono ya Seemedi -Name[pa]=ਆਈਕਾਨ ਝਲਕ -Name[pl]=Widok ikon -Name[pt]=Vista por Ícones -Name[pt_BR]=Visão em Ícones -Name[ro]=Vizualizare iconică -Name[ru]=В виде значков -Name[rw]=Igaragaza ry'Agashushondanga -Name[se]=Govaščájeheapmi -Name[sk]=Prehliadač ikon -Name[sl]=Ikoniziran pogled -Name[sr]=Приказ са иконама -Name[sr@Latn]=Prikaz sa ikonama -Name[sv]=Ikonvy -Name[ta]=குறும்படக் காட்சி -Name[te]=ప్రతిమ విక్షణ -Name[tg]=Ба намуди нишона -Name[th]=มุมมองแบบไอคอน -Name[tr]=Simge Görünümü -Name[tt]=İkonlı Küreneş -Name[uk]=Вигляд піктограмами -Name[uz]=Nishoncha koʻrinishida -Name[uz@cyrillic]=Нишонча кўринишида -Name[ven]=Mbonalelo ya aikhono -Name[vi]=Xem kiểu Biểu tượng -Name[wa]=Vey en imådjetes -Name[xh]=Imboniselo Yophawu lomfanekiso -Name[zh_CN]=图标视图 -Name[zh_TW]=圖示瀏覽 -Name[zu]=Umbukiso wophawu lwesithombe MimeType=inode/directory X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=konq_iconview diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index 5c1584efc..f0713fcde 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -44,7 +44,7 @@ class IconViewBrowserExtension; class KonqKfmIconView : public KonqDirPart { friend class IconViewBrowserExtension; // to access m_pProps - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool supportsUndo READ supportsUndo ) TQ_PROPERTY( TQString viewMode READ viewMode WRITE setViewMode ) public: @@ -224,6 +224,7 @@ protected: KonqIconViewWidget *m_pIconView; TQTimer *m_pTimeoutRefreshTimer; + TQTimer *m_pActivateDoubleClickTimer; TQPtrDict<KFileIVI> m_itemDict; // maps KFileItem * -> KFileIVI * @@ -238,7 +239,7 @@ protected: class IconViewBrowserExtension : public KonqDirPartBrowserExtension { - Q_OBJECT + TQ_OBJECT friend class KonqKfmIconView; // so that it can emit our signals public: IconViewBrowserExtension( KonqKfmIconView *iconView ); @@ -274,9 +275,9 @@ private: bool m_bSaveViewPropertiesLocally; }; -class SpringLoadingManager : public QObject +class SpringLoadingManager : public TQObject { - Q_OBJECT + TQ_OBJECT private: SpringLoadingManager(); static SpringLoadingManager *s_self; diff --git a/konqueror/iconview/konq_multicolumnview.desktop b/konqueror/iconview/konq_multicolumnview.desktop index 70523fc6a..681e89a20 100644 --- a/konqueror/iconview/konq_multicolumnview.desktop +++ b/konqueror/iconview/konq_multicolumnview.desktop @@ -1,84 +1,6 @@ [Desktop Entry] Type=Service Name=MultiColumn View -Name[af]=Multi-kolom Besigtig -Name[ar]=عرض متعدد الأعمدة -Name[az]=Çoxlu Sütun Görünüşü -Name[be]=Шмат слупкоў -Name[bg]=Многоколонен преглед -Name[bn]=মাল্টিকলাম ভিউ -Name[br]=Gwel liesbann -Name[bs]=Višekolonski pogled -Name[ca]=Vista multicolumna -Name[cs]=Vícesloupcový pohled -Name[csb]=Wieloszpaltowi wëzdrzatk -Name[cy]=Golwg Aml-golofn -Name[da]=Multisøjlevisning -Name[de]=Mehrspaltige Ansicht -Name[el]=Προβολή πολλαπλών στηλών -Name[eo]=Multkolumna rigardo -Name[es]=Vista multicolumna -Name[et]=Vaade mitme tulbana -Name[eu]=Zutabe aniztun ikuspegia -Name[fa]=نمای چند ستونی -Name[fi]=Monipalstanäkymä -Name[fr]=Multicolonne -Name[fy]=Multykolomwerjefte -Name[ga]=Amharc Il-cholúin -Name[gl]=Vista en Múltiplas Colunas -Name[he]=תצוגת טורים -Name[hi]=अनेक-स्तम्भ दृश्य -Name[hr]=Prikaz s više stupaca -Name[hu]=Lista -Name[id]=Tampilan Multi kolom -Name[is]=Dálkskipt sýn -Name[it]=Vista a colonne multiple -Name[ja]=マルチカラムビュー -Name[ka]=რამდენიმე სვეტად -Name[kk]=Бірнеше баған -Name[km]=ទិដ្ឋភាពច្រើនជួរឈរ -Name[lo]=ມຸນມອງແບບຫລາຍຄໍລຳ -Name[lt]=Rodyti keliais stulpeliais -Name[lv]=Daudzkolonu Skatījums -Name[mk]=Приказ со повеќе колони -Name[mn]=Олон баганаар харах -Name[ms]=Paparan MultiColumn -Name[mt]=Kolonni -Name[nb]=Flerkolonnevisning -Name[nds]=Mehrstriepen-Ansicht -Name[ne]=बहुविध स्तम्भ दृश्य -Name[nl]=Multikolomweergave -Name[nn]=Multikolonne-vising -Name[nso]=Pono ya Kholomo ya Bontshi -Name[pa]=ਬਹੁ-ਕਾਲਮ ਝਲਕ -Name[pl]=Widok wielokolumnowy -Name[pt]=Vista por Multi-colunas -Name[pt_BR]=Visão Multicolunas -Name[ro]=Vizualizare multicoloană -Name[ru]=В несколько колонок -Name[rw]=Igaragaza InkingiZitandukanye -Name[se]=Moanábálsttá-čájeheapmi -Name[sk]=Multi-stĺpcový pohľad -Name[sl]=Večstolpčni pogled -Name[sr]=Приказ са више колона -Name[sr@Latn]=Prikaz sa više kolona -Name[sv]=Flerkolumnsvy -Name[ta]=பலநெடுவரிசை காட்சி -Name[te]=ఎక్కువ నిలువవరుసల విక్షణ -Name[tg]=Ба намуди чанд сутун -Name[th]=มุมมองแบบหลายคอลัมน์ -Name[tr]=Çoklu Sütun Görünümü -Name[tt]=Berniçä Asma belän -Name[uk]=Вигляд стовпчиками -Name[uz]=Koʻp ustun koʻrinishida -Name[uz@cyrillic]=Кўп устун кўринишида -Name[ven]=Mbonalelo ya kholomu dzo fhambananho -Name[vi]=Xem kiểu Nhiều cột -Name[wa]=Vey e colones -Name[xh]=Imboniselo Enemihlathi emininzie -Name[zh_CN]=多列视图 -Name[zh_TW]=多列瀏覽 -Name[zu]=Umbukiso onamakholumu amaningi MimeType=inode/directory X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=konq_iconview diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 1313ccd38..395da6a5d 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -80,136 +78,136 @@ void KEBApp::createActions() { // save and quit should probably not be in the toplevel??? (void) KStdAction::quit( - TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + this, TQ_SLOT( close() ), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); (void) KStdAction::configureToolbars( - TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection()); + this, TQ_SLOT( slotConfigureToolbars() ), actionCollection()); if (m_browser) { (void) KStdAction::open( - TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection()); + actn, TQ_SLOT( slotLoad() ), actionCollection()); (void) KStdAction::saveAs( - TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection()); + actn, TQ_SLOT( slotSaveAs() ), actionCollection()); } - (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection()); - (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection()); - (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection()); - (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection()); + (void) KStdAction::cut(actn, TQ_SLOT( slotCut() ), actionCollection()); + (void) KStdAction::copy(actn, TQ_SLOT( slotCopy() ), actionCollection()); + (void) KStdAction::paste(actn, TQ_SLOT( slotPaste() ), actionCollection()); + (void) KStdAction::print(actn, TQ_SLOT( slotPrint() ), actionCollection()); // settings menu (void) new TDEToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(), + actn, TQ_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions (void) new TDEAction( i18n("&Delete"), "edit-delete", Key_Delete, - TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete"); + actn, TQ_SLOT( slotDelete() ), actionCollection(), "delete"); (void) new TDEAction( i18n("Rename"), "text", Key_F2, - TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename"); + actn, TQ_SLOT( slotRename() ), actionCollection(), "rename"); (void) new TDEAction( i18n("C&hange URL"), "text", Key_F3, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); + actn, TQ_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); (void) new TDEAction( i18n("C&hange Comment"), "text", Key_F4, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); + actn, TQ_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); (void) new TDEAction( i18n("Chan&ge Icon..."), "icons", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); + actn, TQ_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); (void) new TDEAction( i18n("Update Favicon"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); + actn, TQ_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); (void) new TDEAction( i18n("Recursive Sort"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); + actn, TQ_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); (void) new TDEAction( i18n("&New Folder..."), "folder-new", CTRL+Key_N, - TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); + actn, TQ_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); (void) new TDEAction( i18n("&New Bookmark"), "www", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); + actn, TQ_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); (void) new TDEAction( i18n("&Insert Separator"), CTRL+Key_I, - TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(), + actn, TQ_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); (void) new TDEAction( i18n("&Sort Alphabetically"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort"); + actn, TQ_SLOT( slotSort() ), actionCollection(), "sort"); (void) new TDEAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); + actn, TQ_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); (void) new TDEAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); + actn, TQ_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); (void) new TDEAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); + actn, TQ_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); (void) new TDEAction( i18n("&Expand All Folders"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); + actn, TQ_SLOT( slotExpandAll() ), actionCollection(), "expandall"); (void) new TDEAction( i18n("Collapse &All Folders"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); + actn, TQ_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); (void) new TDEAction( i18n("&Open in Konqueror"), "document-open", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); + actn, TQ_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); (void) new TDEAction( i18n("Check &Status"), "bookmark", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); + actn, TQ_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); (void) new TDEAction( i18n("Check Status: &All"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); + actn, TQ_SLOT( slotTestAll() ), actionCollection(), "testall" ); (void) new TDEAction( i18n("Update All &Favicons"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), + actn, TQ_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); (void) new TDEAction( i18n("Cancel &Checks"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); + actn, TQ_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); (void) new TDEAction( i18n("Cancel &Favicon Updates"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), + actn, TQ_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); (void) new TDEAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importNS"); (void) new TDEAction( i18n("Import &Opera Bookmarks..."), "opera", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importOpera"); (void) new TDEAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importCrashes"); (void) new TDEAction( i18n("Import &Galeon Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new TDEAction( i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importIE"); (void) new TDEAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importMoz"); (void) new TDEAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); + actn, TQ_SLOT( slotExportNS() ), actionCollection(), "exportNS"); (void) new TDEAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); + actn, TQ_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); (void) new TDEAction( i18n("Export to &HTML Bookmarks..."), "text-html", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); + actn, TQ_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); (void) new TDEAction( i18n("Export to &IE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); + actn, TQ_SLOT( slotExportIE() ), actionCollection(), "exportIE"); (void) new TDEAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); + actn, TQ_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } void ActionsImpl::slotLoad() { @@ -394,7 +392,7 @@ void ActionsImpl::slotImport() { // kdDebug() << "ActionsImpl::slotImport() where sender()->name() == " // << sender()->name() << endl; ImportCommand* import - = ImportCommand::performImport(TQT_TQOBJECT_CONST(sender())->name()+6, KEBApp::self()); + = ImportCommand::performImport(sender()->name()+6, KEBApp::self()); if (!import) return; CmdHistory::self()->addCommand(import); @@ -446,7 +444,7 @@ void ActionsImpl::slotPrint() { s_appId = kapp->dcopClient()->appId(); s_objId = s_part->property("dcopObjectId").toString().latin1(); - connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint())); + connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint())); s_part->openURL(KURL( tmpf.name() )); } diff --git a/konqueror/keditbookmarks/actionsimpl.h b/konqueror/keditbookmarks/actionsimpl.h index 11cd70d57..f0137245b 100644 --- a/konqueror/keditbookmarks/actionsimpl.h +++ b/konqueror/keditbookmarks/actionsimpl.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -23,9 +21,9 @@ #include <tqobject.h> -class ActionsImpl : public QObject +class ActionsImpl : public TQObject { - Q_OBJECT + TQ_OBJECT public: bool save(); diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index 95ae0707f..45da6db7a 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -1,4 +1,3 @@ -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -232,7 +231,7 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) : TQWidget(parent, name), m_connected(false) { timer = new TQTimer(this); - connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges())); + connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( commitChanges())); titlecmd = 0; urlcmd = 0; @@ -247,9 +246,9 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) new TQLabel(m_title_le, i18n("Name:"), this), 0, 0); - connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedTitle(const TQString &) )); - connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() )); + connect(m_title_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedTitle(const TQString &) )); + connect(m_title_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitTitle() )); m_url_le = new BookmarkLineEdit(this); grid->addWidget(m_url_le, 1, 1); @@ -257,18 +256,18 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) new TQLabel(m_url_le, i18n("Location:"), this), 1, 0); - connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedURL(const TQString &) )); - connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() )); + connect(m_url_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedURL(const TQString &) )); + connect(m_url_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitURL() )); m_comment_le = new BookmarkLineEdit(this); grid->addWidget(m_comment_le, 2, 1); grid->addWidget( new TQLabel(m_comment_le, i18n("Comment:"), this), 2, 0); - connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedComment(const TQString &) )); - connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() )); + connect(m_comment_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedComment(const TQString &) )); + connect(m_comment_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitComment() )); m_credate_le = new KLineEdit(this); grid->addWidget(m_credate_le, 0, 3); diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h index 8565616ed..782a7ece7 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.h +++ b/konqueror/keditbookmarks/bookmarkinfo.h @@ -1,4 +1,3 @@ -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -30,7 +29,7 @@ class TQTimer; class BookmarkLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: BookmarkLineEdit( TQWidget * ); public slots: @@ -39,7 +38,7 @@ public slots: class BookmarkInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: BookmarkInfoWidget(TQWidget * = 0, const char * = 0); void showBookmark(const KBookmark &bk); diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp index c30d890e3..35374136f 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.cpp +++ b/konqueror/keditbookmarks/bookmarkiterator.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -29,8 +27,8 @@ #include <tqtimer.h> BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) { - connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), - TQT_SLOT( slotCancelTest(BookmarkIterator *) )); + connect(this, TQ_SIGNAL( deleteSelf(BookmarkIterator *) ), + TQ_SLOT( slotCancelTest(BookmarkIterator *) )); delayedEmitNextOne(); } @@ -39,7 +37,7 @@ BookmarkIterator::~BookmarkIterator() { } void BookmarkIterator::delayedEmitNextOne() { - TQTimer::singleShot(1, this, TQT_SLOT( nextOne() )); + TQTimer::singleShot(1, this, TQ_SLOT( nextOne() )); } void BookmarkIterator::slotCancelTest(BookmarkIterator *test) { diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h index 0931ccaf7..8f5df481a 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.h +++ b/konqueror/keditbookmarks/bookmarkiterator.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -28,9 +26,9 @@ class KEBListViewItem; class BookmarkIteratorHolder; -class BookmarkIterator : public QObject +class BookmarkIterator : public TQObject { - Q_OBJECT + TQ_OBJECT public: BookmarkIterator(TQValueList<KBookmark> bks); diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index f69c01ca5..6f228e565 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h index 84268a698..92e56bed5 100644 --- a/konqueror/keditbookmarks/commands.h +++ b/konqueror/keditbookmarks/commands.h @@ -1,4 +1,3 @@ -// kate: space-indent on; indent-width 3; replace-tabs on; /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp index 570445cae..b02f0af16 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/konqueror/keditbookmarks/dcop.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -39,8 +37,8 @@ KBookmarkEditorIface::KBookmarkEditorIface() : TQObject(), DCOPObject("KBookmarkEditor") { - // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ), - // this, TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); + // connect(KBookmarkNotifier_stub, TQ_SIGNAL( updatedAccessMetadata(TQString,TQString) ), + // this, TQ_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false); } diff --git a/konqueror/keditbookmarks/dcop.h b/konqueror/keditbookmarks/dcop.h index 6914f2db4..441ff8c9e 100644 --- a/konqueror/keditbookmarks/dcop.h +++ b/konqueror/keditbookmarks/dcop.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -25,7 +23,7 @@ class KBookmarkEditorIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: KBookmarkEditorIface(); diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp index 681883883..1865986b6 100644 --- a/konqueror/keditbookmarks/exporters.cpp +++ b/konqueror/keditbookmarks/exporters.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index f4e2183ea..73cbd9ced 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -85,9 +83,9 @@ void FavIconsItr::doAction() { // kdDebug() << "FavIconsItr::doAction()" << endl; curItem()->setTmpStatus(i18n("Updating favicon...")); if (!m_updater) { - m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater"); - connect(m_updater, TQT_SIGNAL( done(bool) ), - this, TQT_SLOT( slotDone(bool) ) ); + m_updater = new FavIconUpdater(kapp, "FavIconUpdater"); + connect(m_updater, TQ_SIGNAL( done(bool) ), + this, TQ_SLOT( slotDone(bool) ) ); } if (curBk().url().protocol().startsWith("http")) { m_updater->downloadIcon(curBk()); diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h index 3be46d35f..a2e4036bc 100644 --- a/konqueror/keditbookmarks/favicons.h +++ b/konqueror/keditbookmarks/favicons.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -47,7 +45,7 @@ class FavIconUpdater; class FavIconsItr : public BookmarkIterator { - Q_OBJECT + TQ_OBJECT public: FavIconsItr(TQValueList<KBookmark> bks); diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp index e809a12e0..104db0048 100644 --- a/konqueror/keditbookmarks/importers.cpp +++ b/konqueror/keditbookmarks/importers.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h index 0550e46f0..fd6aec917 100644 --- a/konqueror/keditbookmarks/importers.h +++ b/konqueror/keditbookmarks/importers.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -35,7 +33,7 @@ // part pure class ImportCommand : public TQObject, public KCommand, public IKEBCommand { - Q_OBJECT + TQ_OBJECT public: ImportCommand() : KCommand(), m_utf8(false), m_folder(false), m_cleanUpCmd(0L) diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h index c7031a377..36e94f535 100644 --- a/konqueror/keditbookmarks/kebsearchline.h +++ b/konqueror/keditbookmarks/kebsearchline.h @@ -24,7 +24,7 @@ class KEBSearchLine : public TDEListViewSearchLine { - Q_OBJECT + TQ_OBJECT public: KEBSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0); diff --git a/konqueror/keditbookmarks/kinsertionsort.h b/konqueror/keditbookmarks/kinsertionsort.h index 5f71184ed..67645db16 100644 --- a/konqueror/keditbookmarks/kinsertionsort.h +++ b/konqueror/keditbookmarks/kinsertionsort.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 92eb1c48b..f5a8474cc 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -231,8 +229,8 @@ void ListView::selected(KEBListViewItem * item, bool s) } //FIXME do it once somewhere if (!KEBApp::self()->bkInfo()->connected()) { - connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ), - TQT_SLOT( slotBkInfoUpdateListViewItem() )); + connect(KEBApp::self()->bkInfo(), TQ_SIGNAL( updateListViewItem() ), + TQ_SLOT( slotBkInfoUpdateListViewItem() )); KEBApp::self()->bkInfo()->setConnected(true); } @@ -648,7 +646,7 @@ class KeyPressEater : public TQObject { bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) { if (pe->type() == TQEvent::KeyPress) { TQKeyEvent *k = (TQKeyEvent *) pe; - if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) + if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab) && !(k->state() & ControlButton || k->state() & AltButton) ) { if (m_allowedToTab) { @@ -657,7 +655,7 @@ bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) { } return true; } else { - m_allowedToTab = (k->key() == Qt::Key_Escape || k->key() == Qt::Key_Enter); + m_allowedToTab = (k->key() == TQt::Key_Escape || k->key() == TQt::Key_Enter); } } return false; @@ -718,21 +716,21 @@ void KEBListView::init() { setDragEnabled(true); setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single); setAllColumnsShowFocus(true); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); } void KEBListView::makeConnections() { - connect(this, TQT_SIGNAL( moved() ), - TQT_SLOT( slotMoved() )); - connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), - TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); - connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), - TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); - connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); - connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), - TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); + connect(this, TQ_SIGNAL( moved() ), + TQ_SLOT( slotMoved() )); + connect(this, TQ_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), + TQ_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); + connect(this, TQ_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), + TQ_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); + connect(this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); + connect(this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), + TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); } void KEBListView::readonlyFlagInit(bool readonly) { @@ -913,7 +911,7 @@ void KEBListViewItem::setOpen(bool open) { void KEBListViewItem::greyStyle(TQColorGroup &cg) { int h, s, v; cg.background().hsv(&h, &s, &v); - TQColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray); + TQColor color = (v > 180 && v < 220) ? (TQt::darkGray) : (TQt::gray); cg.setColor(TQColorGroup::Text, color); } diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index f693c608f..15444c2a5 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -1,4 +1,3 @@ -// kate: space-indent on; indent-width 3; replace-tabs on; /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -82,7 +81,7 @@ private: class KEBListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: enum { NameColumn = 0, @@ -129,7 +128,7 @@ private: // DESIGN - make some stuff private if possible class ListView : public TQObject { - Q_OBJECT + TQ_OBJECT public: // init stuff void initListViews(); diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index d64f6bce7..94e08a357 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 5a7b5ce04..707491741 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -90,10 +88,10 @@ void TestLinkItr::doAction() { m_job->addMetaData("errorPage", "true"); m_job->addMetaData( TQString("cookies"), TQString("none") ); - connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotJobResult(TDEIO::Job *))); - connect(m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotJobResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); curItem()->setTmpStatus(i18n("Checking...")); TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h index a224279df..831029c25 100644 --- a/konqueror/keditbookmarks/testlink.h +++ b/konqueror/keditbookmarks/testlink.h @@ -53,7 +53,7 @@ private: class TestLinkItr : public BookmarkIterator { - Q_OBJECT + TQ_OBJECT public: TestLinkItr(TQValueList<KBookmark> bks); diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index d5a7c865c..d685e8dee 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -60,8 +58,8 @@ CmdHistory* CmdHistory::s_self = 0; CmdHistory::CmdHistory(TDEActionCollection *collection) : m_commandHistory(collection) { - connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ), - TQT_SLOT( slotCommandExecuted(KCommand *) )); + connect(&m_commandHistory, TQ_SIGNAL( commandExecuted(KCommand *) ), + TQ_SLOT( slotCommandExecuted(KCommand *) )); assert(!s_self); s_self = this; // this is hacky } @@ -140,8 +138,8 @@ void CurrentMgr::createManager(const TQString &filename) { m_mgr = KBookmarkManager::managerForFile(filename, false); - connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) )); + connect(m_mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) )); } void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) { @@ -185,7 +183,7 @@ TQString CurrentMgr::makeTimeStr(int b) TQDateTime dt; dt.setTime_t(b); return (dt.daysTo(TQDateTime::currentDateTime()) > 31) - ? TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) + ? TDEGlobal::locale()->formatDate(dt.date(), false) : TDEGlobal::locale()->formatDateTime(dt, false); } @@ -221,8 +219,8 @@ KEBApp::KEBApp( TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine"); quicksearch->setStretchableWidget(searchLineEdit); lbl->setBuddy(searchLineEdit); - connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear())); - connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions())); + connect(resetQuickSearch, TQ_SIGNAL(activated()), searchLineEdit, TQ_SLOT(clear())); + connect(searchLineEdit, TQ_SIGNAL(searchUpdated()), TQ_SLOT(updateActions())); ListView::createListViews(vsplitter); ListView::self()->initListViews(); @@ -231,7 +229,7 @@ KEBApp::KEBApp( m_bkinfo = new BookmarkInfoWidget(vsplitter); - vsplitter->setOrientation(Qt::Vertical); + vsplitter->setOrientation(TQt::Vertical); vsplitter->setSizes(TQValueList<int>() << h << 380 << m_bkinfo->sizeHint().height() ); @@ -247,8 +245,8 @@ KEBApp::KEBApp( m_dcopIface = new KBookmarkEditorIface(); - connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( slotClipboardDataChanged() )); + connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( slotClipboardDataChanged() )); ListView::self()->connectSignals(); @@ -339,8 +337,8 @@ void KEBApp::notifyCommandExecuted() { void KEBApp::slotConfigureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), - TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), + TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h index 7dd056d8d..33a60073e 100644 --- a/konqueror/keditbookmarks/toplevel.h +++ b/konqueror/keditbookmarks/toplevel.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -46,7 +44,7 @@ struct SelcAbilities { }; class CmdHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: CmdHistory(TDEActionCollection *collection); virtual ~CmdHistory() { ; } @@ -74,7 +72,7 @@ class KBookmark; class KBookmarkManager; class CurrentMgr : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef enum {HTMLExport, OperaExport, IEExport, MozillaExport, NetscapeExport} ExportType; @@ -109,7 +107,7 @@ private: }; class KEBApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: static KEBApp* self() { return s_topLevel; } diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index ad55793e0..377026411 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -97,10 +95,10 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { part->setProperty("javaEnabled", TQVariant(false)); part->setProperty("autoloadImages", TQVariant(false)); - connect(part, TQT_SIGNAL( canceled(const TQString &) ), - this, TQT_SLOT( slotCompleted() )); - connect(part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() )); + connect(part, TQ_SIGNAL( canceled(const TQString &) ), + this, TQ_SLOT( slotCompleted() )); + connect(part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() )); KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part); assert(ext); @@ -108,8 +106,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { m_browserIface = new FavIconBrowserInterface(this, "browseriface"); ext->setBrowserInterface(m_browserIface); - connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ), - this, TQT_SLOT( setIconURL(const KURL &) )); + connect(ext, TQ_SIGNAL( setIconURL(const KURL &) ), + this, TQ_SLOT( setIconURL(const KURL &) )); m_part = part; } @@ -117,7 +115,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { if (!m_timer) { // Timeout to stop the updating hanging m_timer = new TQTimer(this); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); } m_timer->start(15000,false); m_webGrabber = new FavIconWebGrabber(m_part, bk.url()); @@ -151,10 +149,10 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url TDEIO::Job *job = TDEIO::get(m_url, false, false); job->addMetaData( TQString("cookies"), TQString("none") ); - connect(job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotFinished(TDEIO::Job *) )); - connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); + connect(job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotFinished(TDEIO::Job *) )); + connect(job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); } void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) { diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h index 44a19af40..0e0e8b336 100644 --- a/konqueror/keditbookmarks/updater.h +++ b/konqueror/keditbookmarks/updater.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -27,9 +25,9 @@ #include <tdeparts/part.h> #include <tdeparts/browserinterface.h> -class FavIconWebGrabber : public QObject +class FavIconWebGrabber : public TQObject { - Q_OBJECT + TQ_OBJECT public: FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url); ~FavIconWebGrabber() {} @@ -47,7 +45,7 @@ class FavIconBrowserInterface; class FavIconUpdater : public KonqFavIconMgr { - Q_OBJECT + TQ_OBJECT public: FavIconUpdater(TQObject *parent, const char *name); @@ -77,7 +75,7 @@ private: class FavIconBrowserInterface : public KParts::BrowserInterface { - Q_OBJECT + TQ_OBJECT public: FavIconBrowserInterface(FavIconUpdater *view, const char *name) : KParts::BrowserInterface(view, name), m_view(view) { diff --git a/konqueror/kfmclient.desktop b/konqueror/kfmclient.desktop index 6ef381e09..fa1eeab64 100644 --- a/konqueror/kfmclient.desktop +++ b/konqueror/kfmclient.desktop @@ -7,16 +7,6 @@ Terminal=false X-TDE-InitialPreference=9 NoDisplay=true Name=Konqueror -Name[bn]=কনকরার -Name[eo]=Konkeranto -Name[hi]=कॉन्करर -Name[lv]=Iekarotājs -Name[mn]=Конкюрор -Name[ne]=कन्क्वेरर -Name[pa]=ਕੋਨਕਿਉਰੋਰ -Name[ta]=கான்கொரர் -Name[te]=కాంకెరర్ -Name[th]=คอนเควอร์เรอร์ X-DCOP-ServiceType=None Categories=Qt;TDE;System; X-TDE-HasTempFileOption=true diff --git a/konqueror/kfmclient_dir.desktop b/konqueror/kfmclient_dir.desktop index 4d7c06645..c01faad0d 100644 --- a/konqueror/kfmclient_dir.desktop +++ b/konqueror/kfmclient_dir.desktop @@ -7,14 +7,4 @@ MimeType=inode/directory; X-TDE-InitialPreference=9 NoDisplay=true Name=Konqueror -Name[bn]=কনকরার -Name[eo]=Konkeranto -Name[hi]=कॉन्करर -Name[lv]=Iekarotājs -Name[mn]=Конкюрор -Name[ne]=कन्क्वेरर -Name[pa]=ਕੋਨਕਿਉਰੋਰ -Name[ta]=கான்கொரர் -Name[te]=కాంకెరర్ -Name[th]=คอนเควอร์เรอร์ Categories=Qt;TDE;System; diff --git a/konqueror/kfmclient_html.desktop b/konqueror/kfmclient_html.desktop index 70594802c..b9e9c4324 100644 --- a/konqueror/kfmclient_html.desktop +++ b/konqueror/kfmclient_html.desktop @@ -7,15 +7,5 @@ MimeType=text/html;application/xhtml+xml;text/xml; X-TDE-InitialPreference=9 NoDisplay=true Name=Konqueror -Name[bn]=কনকরার -Name[eo]=Konkeranto -Name[hi]=कॉन्करर -Name[lv]=Iekarotājs -Name[mn]=Конкюрор -Name[ne]=कन्क्वेरर -Name[pa]=ਕੋਨਕਿਉਰੋਰ -Name[ta]=கான்கொரர் -Name[te]=కాంకెరర్ -Name[th]=คอนเควอร์เรอร์ Categories=Qt;TDE;System; X-TDE-HasTempFileOption=true diff --git a/konqueror/kfmclient_war.desktop b/konqueror/kfmclient_war.desktop index 665ba2ade..30c7fd40f 100644 --- a/konqueror/kfmclient_war.desktop +++ b/konqueror/kfmclient_war.desktop @@ -7,15 +7,5 @@ MimeType=application/x-webarchive; X-TDE-InitialPreference=9 NoDisplay=true Name=Konqueror -Name[bn]=কনকরার -Name[eo]=Konkeranto -Name[hi]=कॉन्करर -Name[lv]=Iekarotājs -Name[mn]=Конкюрор -Name[ne]=कन्क्वेरर -Name[pa]=ਕੋਨਕਿਉਰੋਰ -Name[ta]=கான்கொரர் -Name[te]=కాంకెరర్ -Name[th]=คอนเควอร์เรอร์ Categories=Qt;TDE;System; X-TDE-HasTempFileOption=true diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cpp index 934c326f7..fa93bca57 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cpp @@ -94,14 +94,14 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) return -1; // Go menu - if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( widget->inherits("TQPopupMenu") ) { m_goMenu = (TQPopupMenu*)widget; // Forward signal (to main view) - connect( m_goMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SIGNAL( menuAboutToShow() ) ); - connect( m_goMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotActivated( int ) ) ); + connect( m_goMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SIGNAL( menuAboutToShow() ) ); + connect( m_goMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotActivated( int ) ) ); //kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl; // Store how many items the menu already contains. // This means, the KonqBidiHistoryAction has to be plugged LAST in a menu ! @@ -261,12 +261,12 @@ int KonqLogoAction::plug( TQWidget *widget, int index ) int id_ = getToolButtonID(); - bar->insertAnimatedWidget( id_, this, TQT_SIGNAL(activated()), TQString("trinity"), index ); + bar->insertAnimatedWidget( id_, this, TQ_SIGNAL(activated()), TQString("trinity"), index ); bar->alignItemRight( id_ ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -284,12 +284,12 @@ KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &ic { m_menu = new TQPopupMenu; - connect( m_menu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPopupAboutToShow() ) ); - connect( m_menu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotPopupActivated() ) ); - connect( m_menu, TQT_SIGNAL( aboutToHide() ), - this, TQT_SLOT( slotPopupAboutToHide() ) ); + connect( m_menu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPopupAboutToShow() ) ); + connect( m_menu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotPopupActivated() ) ); + connect( m_menu, TQ_SIGNAL( aboutToHide() ), + this, TQ_SLOT( slotPopupAboutToHide() ) ); } KonqViewModeAction::~KonqViewModeAction() @@ -355,10 +355,10 @@ KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text, { setDelayed( false ); - connect( popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotFillMenu() )); - //connect( popupMenu(), TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotClearMenu() )); - connect( popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated(int) )); + connect( popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotFillMenu() )); + //connect( popupMenu(), TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotClearMenu() )); + connect( popupMenu(), TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated(int) )); // Need to do all this upfront for a correct initial state init(); } @@ -380,11 +380,11 @@ void KonqMostOftenURLSAction::parseHistory() // only ever called once KonqHistoryManager *mgr = KonqHistoryManager::kself(); KonqHistoryIterator it( mgr->entries() ); - connect( mgr, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * )), - TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ))); - connect( mgr, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry * )), - TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry * ))); - connect( mgr, TQT_SIGNAL( cleared() ), TQT_SLOT( slotHistoryCleared() )); + connect( mgr, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * )), + TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ))); + connect( mgr, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry * )), + TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry * ))); + connect( mgr, TQ_SIGNAL( cleared() ), TQ_SLOT( slotHistoryCleared() )); s_mostEntries = new MostOftenList; // exit() will clean this up for now for ( uint i = 0; it.current() && i < s_maxEntries; i++ ) { diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h index 134c8996f..cf399e986 100644 --- a/konqueror/konq_actions.h +++ b/konqueror/konq_actions.h @@ -33,7 +33,7 @@ class TQPopupMenu; */ class KonqBidiHistoryAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: KonqBidiHistoryAction( const TQString & text, TQObject* parent = 0, const char* name = 0 ); @@ -70,7 +70,7 @@ private: class KonqLogoAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: KonqLogoAction( const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 ); KonqLogoAction( const TQString& text, int accel, @@ -95,7 +95,7 @@ private: class KonqViewModeAction : public TDERadioAction { - Q_OBJECT + TQ_OBJECT public: KonqViewModeAction( const TQString &text, const TQString &icon, TQObject *parent, const char *name ); @@ -126,7 +126,7 @@ protected: class KonqMostOftenURLSAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: KonqMostOftenURLSAction( const TQString& text, TQObject *parent, diff --git a/konqueror/konq_browseriface.cc b/konqueror/konq_browseriface.cpp index ebec2ef04..ebec2ef04 100644 --- a/konqueror/konq_browseriface.cc +++ b/konqueror/konq_browseriface.cpp diff --git a/konqueror/konq_browseriface.h b/konqueror/konq_browseriface.h index 1564a73e2..49f8414d3 100644 --- a/konqueror/konq_browseriface.h +++ b/konqueror/konq_browseriface.h @@ -7,7 +7,7 @@ class KonqView; class KonqBrowserInterface : public KParts::BrowserInterface { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( uint historyLength READ historyLength ) public: KonqBrowserInterface( KonqView *view, const char *name ); diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cpp index 17075a529..ef65a5412 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cpp @@ -95,7 +95,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) : KHistoryCombo( parent, name ), m_returnPressed( false ), m_permanent( false ), - m_modifier( Qt::NoButton ), + m_modifier( TQt::NoButton ), m_pageSecurity( KonqMainWindow::NotCrypted ) { setInsertionPolicy( NoInsertion ); @@ -122,14 +122,14 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) // Make the lineedit consume the Key_Enter event... setTrapReturnKey( true ); - connect( KonqHistoryManager::kself(), TQT_SIGNAL(cleared()), TQT_SLOT(slotCleared()) ); - connect( this, TQT_SIGNAL(cleared() ), TQT_SLOT(slotCleared()) ); - connect( this, TQT_SIGNAL(highlighted( int )), TQT_SLOT(slotSetIcon( int )) ); - connect( this, TQT_SIGNAL(activated( const TQString& )), - TQT_SLOT(slotActivated( const TQString& )) ); + connect( KonqHistoryManager::kself(), TQ_SIGNAL(cleared()), TQ_SLOT(slotCleared()) ); + connect( this, TQ_SIGNAL(cleared() ), TQ_SLOT(slotCleared()) ); + connect( this, TQ_SIGNAL(highlighted( int )), TQ_SLOT(slotSetIcon( int )) ); + connect( this, TQ_SIGNAL(activated( const TQString& )), + TQ_SLOT(slotActivated( const TQString& )) ); setHistoryEditorEnabled( true ); - connect( this, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(slotRemoved( const TQString& )) ); + connect( this, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(slotRemoved( const TQString& )) ); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -396,10 +396,10 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev ) // Handle Ctrl+Del/Backspace etc better than the Qt widget, which always // jumps to the next whitespace. TQLineEdit *edit = lineEdit(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) { + if ( o == edit ) { int type = ev->type(); if ( type == TQEvent::KeyPress ) { - TQKeyEvent *e = TQT_TQKEYEVENT( ev ); + TQKeyEvent *e = static_cast<TQKeyEvent*>( ev ); if ( e->key() == Key_Return || e->key() == Key_Enter ) { m_modifier = e->state(); @@ -537,7 +537,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) { m_dragStart = TQPoint(); // null QPoint - if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) { + if ( e->button() == TQt::LeftButton && pixmap( currentItem()) ) { // check if the pixmap was clicked int x = e->pos().x(); int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); @@ -548,7 +548,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) } } - if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { + if ( e->button() == TQt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { // check if the lock icon was clicked int x = e->pos().x(); int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); @@ -566,7 +566,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e ) if ( m_dragStart.isNull() || currentText().isEmpty() ) return; - if ( e->state() & Qt::LeftButton && + if ( e->state() & TQt::LeftButton && (e->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { @@ -591,7 +591,7 @@ void KonqCombo::slotActivated( const TQString& text ) applyPermanent(); m_returnPressed = true; emit activated( text, m_modifier ); - m_modifier = Qt::NoButton; + m_modifier = TQt::NoButton; } void KonqCombo::setConfig( TDEConfig *kc ) @@ -651,7 +651,7 @@ void KonqCombo::setPageSecurity( int pageSecurity ) bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2) { - // Taken from tdehtml/misc/helper.cc + // Taken from tdehtml/misc/helper.cpp #define HUE_DISTANCE 40 #define CONTRAST_DISTANCE 10 @@ -731,7 +731,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) if ( !text().isEmpty() ) { TQString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth ); painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight, - Qt::AlignLeft | Qt::AlignTop, squeezedText ); + TQt::AlignLeft | TQt::AlignTop, squeezedText ); //painter->setPen( TDEGlobalSettings::inactiveTextColor() ); squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth ); @@ -739,7 +739,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) font.setItalic( true ); painter->setFont( font ); painter->drawText( entryWidth - titleWidth, 0, titleWidth, - itemHeight, Qt::AlignLeft | Qt::AlignTop, squeezedText ); + itemHeight, TQt::AlignLeft | TQt::AlignTop, squeezedText ); } } diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h index 0bfe76a87..9a46d763f 100644 --- a/konqueror/konq_combo.h +++ b/konqueror/konq_combo.h @@ -32,7 +32,7 @@ class TDEConfig; // KComboBox would do fine. class KonqCombo : public KHistoryCombo { - Q_OBJECT + TQ_OBJECT public: KonqCombo( TQWidget *parent, const char *name ); diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cpp index ab5080596..861fe0fff 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cpp @@ -1,5 +1,5 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*- - konq_extensionmanager.cc - Extension Manager for Konqueror +/* + konq_extensionmanager.cpp - Extension Manager for Konqueror Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2004 by Arend van Beelen jr. <arend@auton.nl> @@ -52,9 +52,9 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai (new TQVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true); d->pluginSelector = new KPluginSelector(plainPage()); setMainWidget(d->pluginSelector); - connect(d->pluginSelector, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(setChanged(bool))); - connect(d->pluginSelector, TQT_SIGNAL(configCommitted(const TQCString &)), - KSettings::Dispatcher::self(), TQT_SLOT(reparseConfiguration(const TQCString &))); + connect(d->pluginSelector, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(setChanged(bool))); + connect(d->pluginSelector, TQ_SIGNAL(configCommitted(const TQCString &)), + KSettings::Dispatcher::self(), TQ_SLOT(reparseConfiguration(const TQCString &))); d->mainWindow = mainWindow; d->activePart = activePart; @@ -100,8 +100,8 @@ void KonqExtensionManager::apply() setChanged(false); if( d->mainWindow ) { - KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, TDEGlobal::instance()); - TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow)); + KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, TDEGlobal::instance()); + TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow); TQPtrListIterator<KParts::Plugin> it(plugins); KParts::Plugin *plugin; while((plugin = it.current()) != 0) diff --git a/konqueror/konq_extensionmanager.h b/konqueror/konq_extensionmanager.h index ac1f466b3..b70a2d5db 100644 --- a/konqueror/konq_extensionmanager.h +++ b/konqueror/konq_extensionmanager.h @@ -1,4 +1,4 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*- +/* konq_extensionmanager.h - Extension Manager for Konqueror @@ -33,7 +33,7 @@ namespace KParts { class ReadOnlyPart; } */ class KonqExtensionManager : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KonqExtensionManager(TQWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart); diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cpp index d89cbf9a6..0a69c1c8c 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cpp @@ -64,17 +64,17 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha else { if ( m_createBrowser ) - obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "Browser/View", m_args ); + obj = m_factory->create( parentWidget, name, "Browser/View", m_args ); if ( !obj ) - obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "KParts::ReadOnlyPart", m_args ); + obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args ); } if ( !obj->inherits( "KParts::ReadOnlyPart" ) ) kdError(1202) << "Part " << obj << " (" << obj->className() << ") doesn't inherit KParts::ReadOnlyPart !" << endl; KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>( obj ); - TQFrame* frame = ::tqqt_cast<TQFrame*>( part->widget() ); + TQFrame* frame = ::tqt_cast<TQFrame*>( part->widget() ); if (frame) { frame->setFrameStyle( TQFrame::NoFrame ); diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cpp index 0acf39b49..32ca35650 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cpp @@ -68,7 +68,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) setSizeGripEnabled( false ); m_led = new TQLabel( this ); - m_led->setAlignment( Qt::AlignCenter ); + m_led->setAlignment( TQt::AlignCenter ); m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); addWidget( m_led, 0, false ); // led (active view indicator) m_led->hide(); @@ -80,7 +80,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" ); - m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus); + m_pLinkedViewCheckBox->setFocusPolicy(TQWidget::NoFocus); m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); TQWhatsThis::add( m_pLinkedViewCheckBox, i18n("Checking this box on at least two views sets those views as 'linked'. " @@ -90,8 +90,8 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) "directory tree with an icon view or detailed view, and possibly a " "terminal emulator window." ) ); addWidget( m_pLinkedViewCheckBox, 0, true /*permanent->right align*/ ); - connect( m_pLinkedViewCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(linkedViewClicked(bool)) ); + connect( m_pLinkedViewCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(linkedViewClicked(bool)) ); m_progressBar = new KProgress( this ); m_progressBar->setMaximumHeight(fontMetrics().height()); @@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu() // We have to ship the remove view action ourselves, // since this may not be the active view (passive view) - TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); + TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQ_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() ); actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() ); @@ -173,15 +173,15 @@ void KonqFrameStatusBar::splitFrameMenu() bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pStatusLabel) && e->type()==TQEvent::MouseButtonPress) + if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress) { emit clicked(); update(); - if ( TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton) + if ( static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton) splitFrameMenu(); return true; } - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::ApplicationPaletteChange ) + else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange ) { unsetPalette(); updateActiveStatus(); @@ -242,7 +242,7 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond ) void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne) { if (newOne!=0) - connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&))); + connect(newOne,TQ_SIGNAL(setStatusBarText(const TQString &)),this,TQ_SLOT(slotDisplayStatusText(const TQString&))); slotDisplayStatusText( TQString::null ); } @@ -302,8 +302,8 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer, // the frame statusbar m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); - connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked())); - connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); + connect(m_pStatusBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStatusBarClicked())); + connect( m_pStatusBar, TQ_SIGNAL( linkedViewClicked( bool ) ), this, TQ_SLOT( slotLinkedViewClicked( bool ) ) ); m_separator = 0; m_pParentContainer = parentContainer; } @@ -397,7 +397,7 @@ bool KonqFrame::eventFilter(TQObject* /*obj*/, TQEvent *ev) { if (ev->type()==TQEvent::KeyPress) { - TQKeyEvent * keyEv = TQT_TQKEYEVENT(ev); + TQKeyEvent * keyEv = static_cast<TQKeyEvent*>(ev); if ((keyEv->key()==Key_Tab) && (keyEv->state()==ControlButton)) { emit ((KonqFrameContainer*)parent())->ctrlTabPressed(); @@ -420,8 +420,8 @@ void KonqFrame::setView( KonqView* child ) m_pView = child; if (m_pView) { - connect(m_pView,TQT_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)), - m_pStatusBar,TQT_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *))); + connect(m_pView,TQ_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)), + m_pStatusBar,TQ_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *))); } } @@ -460,11 +460,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode ) void KonqFrame::paintEvent( TQPaintEvent* ) { -#ifdef USE_QT4 - #warning [INFO] Repaint call disabled in Qt4 to prevent recursive repaint (which otherwise occurs for unknown reasons) -#else // USE_QT4 m_pStatusBar->repaint(); -#endif // USE_QT4 } void KonqFrame::slotRemoveView() @@ -534,9 +530,9 @@ void KonqFrameContainer::saveConfig( TDEConfig* config, const TQString &prefix, //write orientation TQString o; - if( orientation() == Qt::Horizontal ) + if( orientation() == TQt::Horizontal ) o = TQString::fromLatin1("Horizontal"); - else if( orientation() == Qt::Vertical ) + else if( orientation() == TQt::Vertical ) o = TQString::fromLatin1("Vertical"); config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o ); diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h index e3ae0ba2a..77dd99689 100644 --- a/konqueror/konq_frame.h +++ b/konqueror/konq_frame.h @@ -64,7 +64,7 @@ namespace KParts */ class KonqCheckBox : public TQCheckBox { - Q_OBJECT // for classname + TQ_OBJECT // for classname public: KonqCheckBox(TQWidget *parent=0, const char *name=0) :TQCheckBox( parent, name ) {} @@ -80,7 +80,7 @@ protected: */ class KonqFrameStatusBar : public KStatusBar { - Q_OBJECT + TQ_OBJECT public: KonqFrameStatusBar( KonqFrame *_parent = 0L, const char *_name = 0L ); @@ -198,7 +198,7 @@ protected: class KonqFrame : public TQWidget, public KonqFrameBase { - Q_OBJECT + TQ_OBJECT public: KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer = 0L, @@ -346,7 +346,7 @@ protected: class KonqFrameContainer : public TQSplitter, public KonqFrameContainerBase { - Q_OBJECT + TQ_OBJECT friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX public: KonqFrameContainer( Orientation o, diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cpp index 31647b0c3..2e3703151 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cpp @@ -157,7 +157,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const action.setAttribute( "group", "preview" ); (void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0, - TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); + m_mainWindow, TQ_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); } ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) @@ -202,8 +202,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) if ( (*cIt)->icon() != "unknown" ) action->setIcon( (*cIt)->icon() ); - connect( action, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleView( bool ) ) ); + connect( action, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleView( bool ) ) ); m_actions.insert( name, action ); @@ -212,10 +212,10 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) m_mapOrientation.insert( name, horizontal ); } - connect( m_mainWindow, TQT_SIGNAL( viewAdded( KonqView * ) ), - this, TQT_SLOT( slotViewAdded( KonqView * ) ) ); - connect( m_mainWindow, TQT_SIGNAL( viewRemoved( KonqView * ) ), - this, TQT_SLOT( slotViewRemoved( KonqView * ) ) ); + connect( m_mainWindow, TQ_SIGNAL( viewAdded( KonqView * ) ), + this, TQ_SLOT( slotViewAdded( KonqView * ) ) ); + connect( m_mainWindow, TQ_SIGNAL( viewRemoved( KonqView * ) ), + this, TQ_SLOT( slotViewRemoved( KonqView * ) ) ); } ToggleViewGUIClient::~ToggleViewGUIClient() @@ -235,7 +235,7 @@ TQPtrList<TDEAction> ToggleViewGUIClient::actions() const void ToggleViewGUIClient::slotToggleView( bool toggle ) { - TQString serviceName = TQString::fromLatin1( TQT_TQOBJECT_CONST(sender())->name() ); + TQString serviceName = TQString::fromLatin1( sender()->name() ); bool horizontal = m_mapOrientation[ serviceName ]; @@ -244,7 +244,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) if ( toggle ) { - KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal, + KonqView *childView = viewManager->splitWindow( horizontal ? TQt::Vertical : TQt::Horizontal, TQString::fromLatin1( "Browser/View" ), serviceName, !horizontal /* vertical = make it first */); diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h index 73d9b9a60..3fbaf9388 100644 --- a/konqueror/konq_guiclients.h +++ b/konqueror/konq_guiclients.h @@ -71,7 +71,7 @@ private: class ToggleViewGUIClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: ToggleViewGUIClient( KonqMainWindow *mainWindow ); virtual ~ToggleViewGUIClient(); diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cpp index ee1fc71db..ee1fc71db 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cpp diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cpp index ff9d797cb..01cbf5a52 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cpp @@ -186,13 +186,13 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this ); m_pBookmarksOwner = extOwner; connect( extOwner, - TQT_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ), + TQ_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ), extOwner, - TQT_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) ); + TQ_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) ); // init history-manager, load history, get completion object if ( !s_pCompletion ) { - KonqHistoryManager *mgr = new KonqHistoryManager( TQT_TQOBJECT(kapp), "history mgr" ); + KonqHistoryManager *mgr = new KonqHistoryManager( kapp, "history mgr" ); s_pCompletion = mgr->completionObject(); @@ -201,7 +201,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con int mode = KonqSettings::settingsCompletionMode(); s_pCompletion->setCompletionMode( (TDEGlobalSettings::Completion) mode ); } - connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory())); + connect(KParts::HistoryProvider::self(), TQ_SIGNAL(cleared()), TQ_SLOT(slotClearComboHistory())); KonqPixmapProvider *prov = KonqPixmapProvider::self(); if ( !s_comboConfig ) { @@ -210,17 +210,17 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con s_comboConfig->setGroup( "Location Bar" ); prov->load( s_comboConfig, "ComboIconCache" ); } - connect( prov, TQT_SIGNAL( changed() ), TQT_SLOT( slotIconsChanged() ) ); + connect( prov, TQ_SIGNAL( changed() ), TQ_SLOT( slotIconsChanged() ) ); initCombo(); initActions(); setInstance( TDEGlobal::instance() ); - connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), - this, TQT_SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), + this, TQ_SLOT( slotDatabaseChanged() ) ); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged()), TQT_SLOT(slotReconfigure())); + connect( kapp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure())); //load the xmlui file specified in the profile or the default konqueror.rc setXMLFile( xmluiFile ); @@ -229,7 +229,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con createGUI( 0L ); - connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); + connect(toolBarMenuAction(),TQ_SIGNAL(activated()),this,TQ_SLOT(slotForceSaveMainWindowSettings()) ); if ( !m_toggleViewGUIClient->empty() ) plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); @@ -255,8 +255,8 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqUndoManager::incRef(); - connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ), - this, TQT_SLOT( slotUndoAvailable( bool ) ) ); + connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ), + this, TQ_SLOT( slotUndoAvailable( bool ) ) ); m_bNeedApplyKonqMainWindowSettings = true; if ( !initialURL.isEmpty() ) @@ -360,8 +360,8 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T m_bookmarkBarActionCollection = new TDEActionCollection( this ); m_bookmarkBarActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarkBarActionCollection ); - DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) ); - connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) ); + DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res ); + connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT(initBookmarkBar()) ); } } @@ -370,18 +370,18 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T void KonqMainWindow::initBookmarkBar() { - TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) ); + TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) ); if (!bar) return; delete m_paBookmarkBar; - m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, TQT_TQOBJECT(this) ); + m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this ); connect( m_paBookmarkBar, - TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), - this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); + TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), + this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_paBookmarkBar, - TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), - this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); + TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), + this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); // hide if empty if (bar->count() == 0 ) @@ -476,11 +476,9 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, const TQString &_serviceType, KonqOpenURLRequest& req, bool trustedSource ) { -#ifndef NDEBUG // needed for req.debug() kdDebug(1202) << "KonqMainWindow::openURL : url = '" << _url << "' " << "serviceType='" << _serviceType << "' req=" << req.debug() << " view=" << _view << endl; -#endif KURL url( _url ); if (url.url().startsWith("$(")) { @@ -543,6 +541,27 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, return; } + // Default action for media encrypted disks is either lock or unlock based on current status + TQString lockingAction = TQString::null; + if (serviceType.contains("encrypted_locked")) { + lockingAction = "konqueror/servicemenus/media_unlock.desktop"; + } + else if (serviceType.contains("encrypted_unlocked")) { + lockingAction = "konqueror/servicemenus/media_lock.desktop"; + } + if (!lockingAction.isEmpty()) { + TQString lockingService = TDEGlobal::dirs()->findResource("data", lockingAction); + if (!lockingService.isEmpty()) { + TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, url.isLocalFile()); + if (serviceList.count() == 1) { + KURL::List m_lstURLs; + m_lstURLs.append(url); + KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]); + return; + } + } + } + TQString nameFilter = detectNameFilter( url ); if ( !nameFilter.isEmpty() ) { @@ -680,7 +699,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, if ( view == m_currentView ) startAnimation(); - connect( run, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRunFinished() ) ); + connect( run, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRunFinished() ) ); } } @@ -698,6 +717,27 @@ bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView return false; // execute, don't open // Contract: the caller of this method should ensure the view is stopped first. + // If trying to navigate to an encrypted disk, unlock it if necessary and then navigate to system:/media + if (serviceType.contains("encrypted")) + { + if (serviceType.contains("encrypted_locked")) + { + TQString lockingService = TDEGlobal::dirs()->findResource("data", "konqueror/servicemenus/media_unlock.desktop"); + if (!lockingService.isEmpty()) + { + TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, _url.isLocalFile()); + if (serviceList.count() == 1) + { + KURL::List m_lstURLs; + m_lstURLs.append(_url); + KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]); + } + } + } + slotGoMedia(); + return true; + } + #ifndef NDEBUG kdDebug(1202) << "KonqMainWindow::openView " << serviceType << " " << _url << " " << childView << " req:" << req.debug() << endl; #endif @@ -939,7 +979,7 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs { kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() ); + KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); TQString frameName = args.frameName; if ( !frameName.isEmpty() ) @@ -1020,9 +1060,9 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts TQObject *KonqMainWindow::lastFrame( KonqView *view ) { TQObject *nextFrame, *viewFrame; - nextFrame = TQT_TQOBJECT(view->frame()); + nextFrame = view->frame(); viewFrame = 0; - while ( nextFrame != 0 && ! nextFrame->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { + while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) { viewFrame = nextFrame; nextFrame = nextFrame->parent(); } @@ -1149,9 +1189,9 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs { KParts::BrowserHostExtension *hostExtension = 0; KParts::ReadOnlyPart *ro_part = 0L; - KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender()); + KParts::BrowserExtension *be = ::tqt_cast<KParts::BrowserExtension *>(sender()); if (be) - ro_part = ::tqqt_cast<KParts::ReadOnlyPart *>(be->parent()); + ro_part = ::tqt_cast<KParts::ReadOnlyPart *>(be->parent()); if ( findChildView( ro_part, args.frameName, &mainWindow, &hostExtension, &part ) ) { // Found a view. If url isn't empty, we should open it - but this never happens currently @@ -1270,7 +1310,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs // well. If the WM has support for _NET_WM_USER_TIME, it will be just set to 0 (=don't focus on show), // and the WM should take care of it itself. bool wm_usertime_support = false; - Time saved_last_input_time = GET_QT_X_USER_TIME(); + Time saved_last_input_time = get_tqt_x_user_time(); if ( windowArgs.lowerWindow ) { NETRootInfo wm_info( tqt_xdisplay(), NET::Supported ); @@ -1280,7 +1320,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs // *sigh*, and I thought nobody would need TQWidget::dontFocusOnShow(). // Avoid Qt's support for user time by setting it to 0, and // set the property ourselves. - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KWin::setUserTime( mainWindow->winId(), 0 ); } // Put below the current window before showing, in case that actually works with the WM. @@ -1293,7 +1333,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( windowArgs.lowerWindow ) { - SET_QT_X_USER_TIME(saved_last_input_time); + set_tqt_x_user_time(saved_last_input_time); if( !wm_usertime_support ) { // No WM support. Let's try ugly tricks. mainWindow->lower(); @@ -1468,7 +1508,7 @@ void KonqMainWindow::slotOpenLocation() void KonqMainWindow::slotToolFind() { - kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << TQT_TQOBJECT_CONST(sender())->className() << endl; + kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << sender()->className() << endl; if ( m_currentView && m_currentView->part()->inherits("KonqDirPart") ) { @@ -1495,10 +1535,10 @@ void KonqMainWindow::slotToolFind() findPart->widget()->show(); findPart->widget()->setFocus(); - connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ), - this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) ); + connect( dirPart, TQ_SIGNAL( findClosed(KonqDirPart *) ), + this, TQ_SLOT( slotFindClosed(KonqDirPart *) ) ); } - else if ( TQT_TQOBJECT_CONST(sender())->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below + else if ( sender()->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below { KURL url; if ( m_currentView && m_currentView->url().isLocalFile() ) @@ -1510,7 +1550,7 @@ void KonqMainWindow::slotToolFind() "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ ); mw->m_paFindFiles->setChecked(true); // Delay it after the openURL call (hacky!) - TQTimer::singleShot( 1, mw, TQT_SLOT(slotToolFind())); + TQTimer::singleShot( 1, mw, TQ_SLOT(slotToolFind())); m_paFindFiles->setChecked(false); } } @@ -1547,7 +1587,7 @@ void KonqMainWindow::slotOpenWith() KURL::List lst; lst.append( m_currentView->url() ); - TQString serviceName = TQT_TQOBJECT_CONST(sender())->name(); + TQString serviceName = sender()->name(); TDETrader::OfferList offers = m_currentView->appServiceOffers(); TDETrader::OfferList::ConstIterator it = offers.begin(); @@ -1565,7 +1605,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) if ( !toggle ) return; - TQString modeName = TQT_TQOBJECT_CONST(sender())->name(); + TQString modeName = sender()->name(); if ( m_currentView->service()->desktopEntryName() == modeName ) return; @@ -1824,14 +1864,14 @@ void KonqMainWindow::slotReloadStop() { } void KonqMainWindow::toggleReloadStopButton(bool isReload) { - //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" ); if (isReload) { m_paReloadStop->setIcon("process-stop"); m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>" "All network transfers will be stopped and Konqueror will display the content " "that has been received so far." ) ); m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) ); - //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" ); + //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload" ); } else { m_paReloadStop->setIcon("reload"); m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document<p>" @@ -1863,7 +1903,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat if( state & TQt::ControlButton ) // Ctrl Left/MMB openFilteredURL( homeURL, req); - else if( state & Qt::MidButton ) + else if( state & TQt::MidButton ) { if(KonqSettings::mmbOpensTab()) openFilteredURL( homeURL, req); @@ -1880,7 +1920,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat void KonqMainWindow::slotHome() { - slotHome(TDEAction::UnknownActivation, Qt::LeftButton); + slotHome(TDEAction::UnknownActivation, TQt::LeftButton); } void KonqMainWindow::slotGoSystem() @@ -1938,7 +1978,7 @@ void KonqMainWindow::slotGoHistory() // Show the sidebar if (!static_cast<TDEToggleAction*>(a)->isChecked()) { a->activate(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistory())); return; } @@ -2002,8 +2042,8 @@ void KonqMainWindow::slotConfigureToolbars() if ( autoSaveSettings() ) saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" ); KEditToolbar dlg(factory()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(initBookmarkBar())); dlg.exec(); } @@ -2131,7 +2171,7 @@ void KonqMainWindow::applyKonqMainWindowSettings() void KonqMainWindow::slotSetStatusBarText( const TQString & ) { // Reimplemented to disable KParts::MainWindow default behaviour - // Does nothing here, see konq_frame.cc + // Does nothing here, see konq_frame.cpp } void KonqMainWindow::slotViewCompleted( KonqView * view ) @@ -2302,8 +2342,8 @@ void KonqMainWindow::insertChildView( KonqView *childView ) kdDebug(1202) << "KonqMainWindow::insertChildView " << childView << endl; m_mapViews.insert( childView->part(), childView ); - connect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ), - this, TQT_SLOT( slotViewCompleted( KonqView * ) ) ); + connect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ), + this, TQ_SLOT( slotViewCompleted( KonqView * ) ) ); if ( !m_pViewManager->isLoadingProfile() ) // see KonqViewManager::loadViewProfile viewCountChanged(); @@ -2315,8 +2355,8 @@ void KonqMainWindow::removeChildView( KonqView *childView ) { kdDebug(1202) << "KonqMainWindow::removeChildView childView " << childView << endl; - disconnect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ), - this, TQT_SLOT( slotViewCompleted( KonqView * ) ) ); + disconnect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ), + this, TQ_SLOT( slotViewCompleted( KonqView * ) ) ); #ifndef NDEBUG dumpViewList(); @@ -2602,14 +2642,14 @@ void KonqMainWindow::slotFileNewAboutToShow() void KonqMainWindow::slotSplitViewHorizontal() { - KonqView * newView = m_pViewManager->splitView( Qt::Horizontal ); + KonqView * newView = m_pViewManager->splitView( TQt::Horizontal ); if (newView == 0L) return; newView->openURL( m_currentView->url(), m_currentView->locationBarURL() ); } void KonqMainWindow::slotSplitViewVertical() { - KonqView * newView = m_pViewManager->splitView( Qt::Vertical ); + KonqView * newView = m_pViewManager->splitView( TQt::Vertical ); if (newView == 0L) return; newView->openURL( m_currentView->url(), m_currentView->locationBarURL() ); } @@ -2674,7 +2714,7 @@ void KonqMainWindow::slotBreakOffTabPopup() //Can't do this safely here as the tabbar may disappear and we're //hanging off here. - TQTimer::singleShot(0, this, TQT_SLOT( slotBreakOffTabPopupDelayed() ) ); + TQTimer::singleShot(0, this, TQ_SLOT( slotBreakOffTabPopupDelayed() ) ); } void KonqMainWindow::slotBreakOffTabPopupDelayed() @@ -2818,7 +2858,7 @@ void KonqMainWindow::slotRemoveTabPopup() } //Can't do immediately - may kill the tabbar, and we're in an event path down from it - TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveTabPopupDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveTabPopupDelayed() ) ); } void KonqMainWindow::slotRemoveTabPopupDelayed() @@ -2856,7 +2896,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() m_pViewManager->showTab( originalView ); //Can't do immediately - kills the tabbar, and we're in an event path down from it - TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveOtherTabsPopupDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveOtherTabsPopupDelayed() ) ); } void KonqMainWindow::slotRemoveOtherTabsPopupDelayed() @@ -2905,7 +2945,7 @@ void KonqMainWindow::slotActivatePrevTab() void KonqMainWindow::slotActivateTab() { - m_pViewManager->activateTab( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 ); + m_pViewManager->activateTab( TQString( sender()->name() ).right( 2 ).toInt() -1 ); } void KonqMainWindow::slotDumpDebugInfo() @@ -3088,13 +3128,13 @@ void KonqMainWindow::slotUpAboutToShow() void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state) { m_goState = state; - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) ); } void KonqMainWindow::slotUp() { - m_goState = Qt::LeftButton; - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); + m_goState = TQt::LeftButton; + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) ); } void KonqMainWindow::slotUpDelayed() @@ -3111,7 +3151,7 @@ void KonqMainWindow::slotUpDelayed() const TQString& url = m_currentView->upURL().url(); if(m_goState & TQt::ControlButton) openFilteredURL(url, req ); - else if(m_goState & Qt::MidButton) + else if(m_goState & TQt::MidButton) { if(KonqSettings::mmbOpensTab()) openFilteredURL( url, req); @@ -3120,7 +3160,7 @@ void KonqMainWindow::slotUpDelayed() } else openFilteredURL( url, false ); - m_goState = Qt::LeftButton; + m_goState = TQt::LeftButton; } void KonqMainWindow::slotUpActivated( int id ) @@ -3141,7 +3181,7 @@ void KonqMainWindow::slotGoMenuAboutToShow() void KonqMainWindow::slotGoHistoryActivated( int steps ) { - slotGoHistoryActivated( steps, Qt::LeftButton ); + slotGoHistoryActivated( steps, TQt::LeftButton ); } void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state ) @@ -3152,7 +3192,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state ) // Only start 1 timer. m_goBuffer = steps; m_goState = state; - TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistoryDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistoryDelayed())); } } @@ -3172,7 +3212,7 @@ void KonqMainWindow::slotGoHistoryDelayed() if (newView && inFront) m_pViewManager->showTab( newView ); } - else if(m_goState & Qt::MidButton) + else if(m_goState & TQt::MidButton) { if(mmbOpensTab) { @@ -3190,7 +3230,7 @@ void KonqMainWindow::slotGoHistoryDelayed() } m_goBuffer = 0; - m_goState = Qt::LeftButton; + m_goState = TQt::LeftButton; } @@ -3244,10 +3284,10 @@ void KonqMainWindow::initCombo() m_combo->init( s_pCompletion ); - connect( m_combo, TQT_SIGNAL(activated(const TQString&,int)), - this, TQT_SLOT(slotURLEntered(const TQString&,int)) ); - connect( m_combo, TQT_SIGNAL(showPageSecurity()), - this, TQT_SLOT(showPageSecurity()) ); + connect( m_combo, TQ_SIGNAL(activated(const TQString&,int)), + this, TQ_SLOT(slotURLEntered(const TQString&,int)) ); + connect( m_combo, TQ_SIGNAL(showPageSecurity()), + this, TQ_SLOT(showPageSecurity()) ); m_pURLCompletion = new KURLCompletion(); m_pURLCompletion->setCompletionMode( s_pCompletion->completionMode() ); @@ -3256,18 +3296,18 @@ void KonqMainWindow::initCombo() // We do want completion of user names, right? //m_pURLCompletion->setReplaceHome( false ); // Leave ~ alone! Will be taken care of by filters!! - connect( m_combo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ))); - connect( m_combo, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( slotMakeCompletion( const TQString& ))); - connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )), - TQT_SLOT( slotSubstringcompletion( const TQString& ))); - connect( m_combo, TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ), - TQT_SLOT( slotRotation( TDECompletionBase::KeyBindingType ))); - connect( m_combo, TQT_SIGNAL( cleared() ), - TQT_SLOT ( slotClearHistory() ) ); - connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), - TQT_SLOT( slotMatch(const TQString&) )); + connect( m_combo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ))); + connect( m_combo, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( slotMakeCompletion( const TQString& ))); + connect( m_combo, TQ_SIGNAL( substringCompletion( const TQString& )), + TQ_SLOT( slotSubstringcompletion( const TQString& ))); + connect( m_combo, TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ), + TQ_SLOT( slotRotation( TDECompletionBase::KeyBindingType ))); + connect( m_combo, TQ_SIGNAL( cleared() ), + TQ_SLOT ( slotClearHistory() ) ); + connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ), + TQ_SLOT( slotMatch(const TQString&) )); m_combo->lineEdit()->installEventFilter(this); @@ -3275,8 +3315,8 @@ void KonqMainWindow::initCombo() if ( !bookmarkCompletionInitialized ) { bookmarkCompletionInitialized = true; - DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, TQT_TQOBJECT(m_combo->lineEdit()) ); - connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) ); + DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() ); + connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT( bookmarksIntoCompletion() ) ); } } @@ -3422,11 +3462,11 @@ void KonqMainWindow::slotClearComboHistory() bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) { if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) && - m_combo && TQT_BASE_OBJECT(m_combo->lineEdit()) == TQT_BASE_OBJECT(obj) ) + m_combo && m_combo->lineEdit() == obj ) { //kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl; - TQFocusEvent * focusEv = TQT_TQFOCUSEVENT(ev); + TQFocusEvent * focusEv = static_cast<TQFocusEvent*>(ev); if (focusEv->reason() == TQFocusEvent::Popup) { return KParts::MainWindow::eventFilter( obj, ev ); @@ -3464,22 +3504,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) duplicate->setEnabled( false ); if (slotNames.contains("cut()")) - disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); + disconnect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) ); if (slotNames.contains("copy()")) - disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); + disconnect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) ); if (slotNames.contains("paste()")) - disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); + disconnect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) ); if (slotNames.contains("del()")) - disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - disconnect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + disconnect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) ); + disconnect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); - connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); - connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); - connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); - connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); + connect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) ); + connect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) ); + connect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) ); + connect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) ); + connect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) ); m_paTrash->setEnabled(false); m_paDelete->setEnabled(false); @@ -3505,22 +3545,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); if (slotNames.contains("cut()")) - connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); + connect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) ); if (slotNames.contains("copy()")) - connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); + connect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) ); if (slotNames.contains("paste()")) - connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); + connect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) ); if (slotNames.contains("del()")) - connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) ); + connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); - disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); - disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); - disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); - disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); + disconnect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) ); + disconnect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) ); + disconnect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) ); + disconnect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) ); + disconnect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) ); if ( ext ) { @@ -3553,8 +3593,8 @@ void KonqMainWindow::slotClipboardDataChanged() void KonqMainWindow::slotCheckComboSelection() { - //kdDebug(1202) << "m_combo->lineEdit()->hasMarkedText() : " << hasSelection << endl; bool hasSelection = m_combo->lineEdit()->hasSelectedText(); + //kdDebug(1202) << "m_combo->lineEdit()->hasSelectedText() : " << hasSelection << endl; m_paCopy->setEnabled( hasSelection ); m_paCut->setEnabled( hasSelection ); } @@ -3565,7 +3605,7 @@ void KonqMainWindow::slotClearLocationBar( TDEAction::ActivationReason, TQt::But slotStop(); m_combo->clearTemporary(); focusLocationBar(); - if ( state & Qt::MidButton ) + if ( state & TQt::MidButton ) m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) ); } @@ -3775,126 +3815,126 @@ void KonqMainWindow::initActions() // File menu m_pMenuNew = new KNewMenu ( actionCollection(), this, "new_menu" ); - TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); (void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); (void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); - (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); - (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); - (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); + (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); + (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); + (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQ_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); + (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); if (kapp->authorize("shell_access")) { - (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); + (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQ_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); } - (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); + (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQ_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); - m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQ_SLOT( slotToolFind() ), actionCollection(), "findfile" ); m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); - (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); + (void) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit" ); - m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); - m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); - m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); + m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQ_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); + m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQ_SLOT( slotLockView() ), actionCollection(), "lock" ); + m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQ_SLOT( slotLinkView() ), actionCollection(), "link" ); // Go menu m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" ); - connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotUpActivated( int ) ) ); + connect( m_paUp, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paUp->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUpAboutToShow() ) ); + connect( m_paUp->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUpActivated( int ) ) ); TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); m_paBack = new TDEToolBarPopupAction( backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), 0, "", actionCollection(), "back" ); - connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotBackAboutToShow() ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotBackActivated( int ) ) ); + connect( m_paBack, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paBack->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotBackAboutToShow() ) ); + connect( m_paBack->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotBackActivated( int ) ) ); m_paForward = new TDEToolBarPopupAction( backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), 0, "", actionCollection(), "forward" ); - connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardAboutToShow() ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardActivated( int ) ) ); + connect( m_paForward, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paForward->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotForwardAboutToShow() ) ); + connect( m_paForward->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotForwardActivated( int ) ) ); m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" ); - connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) ); - connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) ); + connect( m_paHistory, TQ_SIGNAL( menuAboutToShow() ), this, TQ_SLOT( slotGoMenuAboutToShow() ) ); + connect( m_paHistory, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotGoHistoryActivated( int ) ) ); m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" ); - connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); - - (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); - (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); - (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); - (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); - (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); - //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); - (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); - (void) new TDEAction( i18n( "Autostart" ), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); + connect( m_paHome, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); + + (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQ_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); + (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQ_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); + (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQ_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); + (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQ_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); + (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQ_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); + //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQ_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); + (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQ_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); + (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQ_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" ); - connect( mostOften, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( slotOpenURL( const KURL& ))); - (void) new TDEAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); + connect( mostOften, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( slotOpenURL( const KURL& ))); + (void) new TDEAction( i18n( "History" ), "history", 0, this, TQ_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); // Settings menu - m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); - m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); + m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQ_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); + m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQ_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like... - m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); + m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQ_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); - m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" << - "kde-filepreviews.desktop" << "tde-filetypes.desktop" << + m_configureModules << "tde-filebehavior.desktop" << "tde-fileappearance.desktop" << + "tde-filepreviews.desktop" << "tde-filetypes.desktop" << "tde-tdehtml_behavior.desktop" << "tde-tdehtml_userinterface.desktop" << "tde-tdehtml_java_js.desktop" << "tde-tdehtml_filter.desktop" << "tde-tdehtml_fonts.desktop" << "tde-ebrowsing.desktop" << "tde-kcmhistory.desktop" << "tde-cookies.desktop" << "tde-cache.desktop" << "tde-proxy.desktop" << "tde-kcmcss.desktop" << "tde-kcmcgi.desktop" << "tde-crypto.desktop" << "tde-useragent.desktop" << - "tde-tdehtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop"; + "tde-tdehtml_plugins.desktop" << "tde-kcmkonqyperformance.desktop"; if (!kapp->authorizeControlModules(configModules()).isEmpty()) - KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure()), actionCollection() ); + KStdAction::preferences (this, TQ_SLOT (slotConfigure()), actionCollection() ); - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); - m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); - m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); + m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQ_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); + m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQ_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); // Window menu - m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); - m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); - m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); - m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); - m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); - m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); - m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); - m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); - - m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); - m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); + m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQ_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); + m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQ_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); + m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQ_SLOT( slotAddTab() ), actionCollection(), "newtab" ); + m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQ_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); + m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQ_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); + m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQ_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); + m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQ_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); + m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQ_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); + + m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQ_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); + m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQ_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); TQCString actionname; for (int i=1;i<13;i++) { actionname.sprintf("activate_tab_%02d", i); - new TDEAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname); + new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQ_SLOT(slotActivateTab()), actionCollection(), actionname); } - m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); - m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); + m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQ_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); + m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQ_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); #ifndef NDEBUG - (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); + (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQ_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); #endif - m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); + m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQ_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); m_pamLoadViewProfile = new TDEActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" ); m_pViewManager->setProfiles( m_pamLoadViewProfile ); @@ -3903,19 +3943,19 @@ void KonqMainWindow::initActions() TDEShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); fullScreenShortcut.append( KKey( Key_F11 ) ); m_ptaFullScreen->setShortcut( fullScreenShortcut ); - connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_ptaFullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); - m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); - m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); + m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReload() ), actionCollection(), "reload" ); + m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQ_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); - m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); - m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" ); + m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), actionCollection(), "undo" ); //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); - connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ), - m_paUndo, TQT_SLOT( setText( const TQString & ) ) ); + connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ), + m_paUndo, TQ_SLOT( setText( const TQString & ) ) ); // Those are connected to the browserextension directly m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" ); @@ -3925,24 +3965,24 @@ void KonqMainWindow::initActions() m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); - m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" ); - m_paRename = new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" ); + m_paRename = new TDEAction( i18n( "&Rename" ), "edit_rename", Key_F2, actionCollection(), "rename" ); m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); - connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" ); // F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default. - m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); - m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); + m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQ_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); + m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQ_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); // This action doesn't appear in the GUI, it's for the shortcut only. KNewMenu takes care of the GUI stuff. - m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); - m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); + m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQ_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); + m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); // Location bar m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") ); - (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, TQT_TQOBJECT(this), TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); + (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQ_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); m_locationLabel->setBuddy( m_combo ); KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, @@ -3956,8 +3996,8 @@ void KonqMainWindow::initActions() TDEAction *clearLocation = new TDEAction( i18n( "Clear Location Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CTRL+Key_L, actionCollection(), "clear_location" ); - connect( clearLocation, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - TQT_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( clearLocation, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + TQ_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) ); clearLocation->setWhatsThis( i18n( "Clear Location bar<p>" "Clears the content of the location bar." ) ); @@ -3973,21 +4013,21 @@ void KonqMainWindow::initActions() m_pBookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), m_pBookmarksOwner, m_pamBookmarks->popupMenu(), m_bookmarksActionCollection, true ); connect( m_pBookmarkMenu, - TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), - this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); + TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), + this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_pBookmarkMenu, - TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), - this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); + TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), + this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); TDEAction *addBookmark = actionCollection()->action("add_bookmark"); if (addBookmark) addBookmark->setText(i18n("Bookmark This Location")); - m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() ); + m_paShowMenuBar = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenuBar() ), actionCollection() ); - (void) new TDEAction( i18n( "Kon&queror Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); + (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQ_SLOT( slotIntro() ), actionCollection(), "konqintro" ); - TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" ); + TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQ_SLOT( goURL() ), actionCollection(), "go_url" ); goUrl->setWhatsThis( i18n( "Go<p>" "Goes to the page that has been entered into the location bar." ) ); @@ -4080,13 +4120,13 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm TQValueList<KURL>::Iterator it = list.begin(); for (; it != list.end(); ++it ) popupItems.append( new KFileItem( (*it), TQString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); + pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQ_SLOT( slotPopupNewTabRight() ) ); } else { popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) ); - pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); + pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQ_SLOT( slotPopupNewWindow() ) ); + pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQ_SLOT( slotPopupNewTabRight() ) ); } } @@ -4103,7 +4143,7 @@ void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, TQt::ButtonState if( state & TQt::ControlButton ) // Ctrl Left/MMB openFilteredURL( url, req); - else if( state & Qt::MidButton ) + else if( state & TQt::MidButton ) { if(KonqSettings::mmbOpensTab()) openFilteredURL( url, req); @@ -4305,7 +4345,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) if ( slotNames.contains( it.key()+"()" ) ) { if ( it.key() != "trash" ) - connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ ); + connect( act, TQ_SIGNAL( activated() ), ext, it.data() /* TQ_SLOT(slot name) */ ); act->setEnabled( ext->isActionEnabled( it.key() ) ); const TQString text = ext->actionText( it.key() ); if ( !text.isEmpty() ) @@ -4620,7 +4660,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa { KonqView * m_oldView = m_currentView; - KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() ) ); + KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( sender()->parent() ) ); //kdDebug() << "KonqMainWindow::slotPopupMenu m_oldView=" << m_oldView << " new currentView=" << currentView << " passive:" << currentView->isPassiveMode() << endl; @@ -4661,7 +4701,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa popupMenuCollection.insert( m_paDelete ); // The pasteto action is used when clicking on a dir, to paste into it. - TDEAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); + TDEAction *actPaste = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); actPaste->setEnabled( m_paPaste->isEnabled() ); popupMenuCollection.insert( actPaste ); @@ -4734,10 +4774,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if (doTabHandling) { if (_args.forcesNewWindow()) { - actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); + actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQ_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); + actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); actNewWindow->setToolTip( i18n( "Open the document in a new window" ) ); //Set tab_new_x to point to the correct icon based on NewTabsInFront @@ -4748,12 +4788,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa else tab_new_x = "tab_new_bg" ; - TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); + TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQ_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) ); - TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); + TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) ); - actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); - actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); + actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); + actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) ); actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) ); doTabHandling = true; @@ -4789,24 +4829,29 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa connectActionCollection( pPopupMenu->actionCollection() ); - pPopupMenu->factory()->addClient( konqyMenuClient ); + if (pPopupMenu->hasGroup("tabhandling")) + { + // "tabhandling" group in inserted in the popup menu if no encrypted media devices are part of "_items" + // see libkonq/konq_popupmenu.cpp KonqPopupMenu::setup() method + pPopupMenu->factory()->addClient( konqyMenuClient ); + } if ( client ) pPopupMenu->factory()->addClient( client ); - KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender()); + KParts::BrowserExtension *be = ::tqt_cast<KParts::BrowserExtension *>(sender()); if ( be ) { - TQObject::connect( this, TQT_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQT_SLOT(close()) ); - TQObject::connect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)), - this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) ); + TQObject::connect( this, TQ_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQ_SLOT(close()) ); + TQObject::connect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)), + this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) ); } - TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::disconnect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); - TQGuardedPtr<TQObject> guard(TQT_TQOBJECT(this)); // #149736 + TQGuardedPtr<TQObject> guard(this); // #149736 pPopupMenu->exec( _global ); delete pPopupMenu; @@ -4823,13 +4868,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa return; } - TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); if ( be ) { - TQObject::disconnect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)), - this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) ); + TQObject::disconnect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)), + this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) ); } delete konqyMenuClient; @@ -4860,7 +4905,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa } // Special case: RMB + renaming in sidebar; setFocus would abort editing. TQWidget* fw = focusWidget(); - if ( !fw || !::tqqt_cast<TQLineEdit*>( fw ) ) + if ( !fw || !::tqt_cast<TQLineEdit*>( fw ) ) m_oldView->part()->widget()->setFocus(); } } @@ -4881,13 +4926,13 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items ) void KonqMainWindow::slotOpenEmbedded() { - TQCString name = TQT_TQOBJECT_CONST(sender())->name(); + TQCString name = sender()->name(); m_popupService = m_popupEmbeddingServices[ name.toInt() ]->desktopEntryName(); m_popupEmbeddingServices.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenEmbeddedDoIt() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotOpenEmbeddedDoIt() ) ); } void KonqMainWindow::slotOpenEmbeddedDoIt() @@ -5000,8 +5045,8 @@ void KonqMainWindow::updateOpenWithActions() TDEAction *action = new TDEAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); action->setIcon( (*it)->icon() ); - connect( action, TQT_SIGNAL( activated() ), - this, TQT_SLOT( slotOpenWith() ) ); + connect( action, TQ_SIGNAL( activated() ), + this, TQ_SLOT( slotOpenWith() ) ); m_openWithActions.append( action ); } @@ -5054,7 +5099,7 @@ void KonqMainWindow::updateViewModeActions() if ( services.count() <= 1 ) return; - m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) ); + m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), this ); // a temporary map, just like the m_viewModeToolBarServices map, but // mapping to a KonqViewModeAction object. It's just temporary as we @@ -5087,14 +5132,14 @@ void KonqMainWindow::updateViewModeActions() TQString icon = (*it)->icon(); if ( icon != TQString::fromLatin1( "unknown" ) ) // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon) - action = new TDERadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); + action = new TDERadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() ); else - action = new TDERadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); + action = new TDERadioAction( itname, 0, this, (*it)->desktopEntryName().ascii() ); action->setExclusiveGroup( "KonqMainWindow_ViewModes" ); - connect( action, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotViewModeToggle( bool ) ) ); + connect( action, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotViewModeToggle( bool ) ) ); m_viewModeActions.append( action ); action->plug( m_viewModeMenu->popupMenu() ); @@ -5141,15 +5186,15 @@ void KonqMainWindow::updateViewModeActions() KonqViewModeAction *tbAction = new KonqViewModeAction( text, icon, - TQT_TQOBJECT(this), + this, name ); tbAction->setExclusiveGroup( "KonqMainWindow_ToolBarViewModes" ); tbAction->setChecked( action->isChecked() ); - connect( tbAction, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotViewModeToggle( bool ) ) ); + connect( tbAction, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotViewModeToggle( bool ) ) ); m_toolBarViewModeActions.append( tbAction ); @@ -5233,7 +5278,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject() void KonqMainWindow::updateBookmarkBar() { - TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) ); + TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) ); if (!bar) return; @@ -5473,18 +5518,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) void KonqMainWindow::connectActionCollection( TDEActionCollection *coll ) { - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } void KonqMainWindow::disconnectActionCollection( TDEActionCollection *coll ) { - disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - disconnect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + disconnect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + disconnect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } // @@ -5767,7 +5812,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window ) if( window == NULL ) return; window->viewManager()->clear(); - TDEIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) ); + TDEIO::Scheduler::unregisterWindow( window ); } // used by preloading - this KonqMainWindow will be reused, reset everything @@ -5788,7 +5833,7 @@ void KonqMainWindow::resetWindow() static Atom atom = XInternAtom( tqt_xdisplay(), "_TDE_NET_WM_USER_CREATION_TIME", False ); XChangeProperty( tqt_xdisplay(), winId(), atom, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &x_time, 1); - SET_QT_X_USER_TIME(CurrentTime); // won't have _NET_WM_USER_TIME set + set_tqt_x_user_time(CurrentTime); // won't have _NET_WM_USER_TIME set #if !KDE_IS_VERSION( 3, 2, 90 ) // _KDE_NET_USER_TIME is obsolete static Atom atom2 = XInternAtom( tqt_xdisplay(), "_KDE_NET_USER_TIME", False ); timeval tv; @@ -5972,5 +6017,3 @@ void KonqMainWindow::restoreWindowSize() #include "konq_mainwindow.moc" #include "konq_mainwindow_p.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index 3e9c71ac5..281407cf8 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -1,4 +1,4 @@ -/* -*- c-basic-offset:2 -*- +/* This file is part of the KDE project Copyright (C) 1998, 1999 Simon Hausmann <hausmann@kde.org> Copyright (C) 2000-2004 David Faure <faure@kde.org> @@ -87,7 +87,7 @@ class KonqExtendedBookmarkOwner; class KonqMainWindow : public KParts::MainWindow, public KonqFrameContainerBase { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int viewCount READ viewCount ) TQ_PROPERTY( int activeViewsCount READ activeViewsCount ) TQ_PROPERTY( int linkableViewsCount READ linkableViewsCount ) diff --git a/konqueror/konq_mainwindow_p.h b/konqueror/konq_mainwindow_p.h index d463ec193..10b6c68c1 100644 --- a/konqueror/konq_mainwindow_p.h +++ b/konqueror/konq_mainwindow_p.h @@ -23,7 +23,7 @@ class KonqExtendedBookmarkOwner : public KExtendedBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: KonqExtendedBookmarkOwner(KonqMainWindow *); // for KBookmarkOwner diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cpp index b2f0ad47f..1fbea747e 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cpp @@ -225,8 +225,8 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text , m_mw(mw) { setBackgroundMode( TQt::PaletteButton ); - setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | - Qt::AlignVCenter | TQt::ShowPrefix ); + setAlignment( (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) | + TQt::AlignVCenter | TQt::ShowPrefix ); setAcceptDrops(true); adjustSize(); validDrag = false; @@ -269,7 +269,7 @@ void KonqDraggableLabel::dropEvent( TQDropEvent* ev ) { _savedLst.clear(); if ( KURLDrag::decode( ev, _savedLst ) ) { - TQTimer::singleShot(0, this, TQT_SLOT(delayedOpenURL())); + TQTimer::singleShot(0, this, TQ_SLOT(delayedOpenURL())); } } diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h index ada1712c5..27fe0caa4 100644 --- a/konqueror/konq_misc.h +++ b/konqueror/konq_misc.h @@ -21,7 +21,7 @@ #define _konq_misc_h // This file can hold every global class for konqueror that used to pollute -// konq_main.cc +// konq_main.cpp #include <krun.h> #include <tdeparts/browserextension.h> @@ -111,7 +111,7 @@ public: class KonqDraggableLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: KonqDraggableLabel( KonqMainWindow * mw, const TQString & text ); diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cpp index f7241713b..6819990a9 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cpp @@ -100,8 +100,8 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese box->setStretchFactor( m_pListView, 1 ); - connect( m_pListView, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ), - TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( itemRenamed( TQListViewItem * ) ), + TQ_SLOT( slotItemRenamed( TQListViewItem * ) ) ); loadAllProfiles( preselectProfile ); m_pListView->setMinimumSize( m_pListView->sizeHint() ); @@ -112,11 +112,11 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese m_cbSaveSize = new TQCheckBox( i18n("Save &window size in profile"), box ); m_cbSaveSize->setChecked( KonqSettings::saveWindowSizeInProfile() ); - connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); - connect( m_pProfileNameLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( m_pProfileNameLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h index e0f98a589..cb6db7fcc 100644 --- a/konqueror/konq_profiledlg.h +++ b/konqueror/konq_profiledlg.h @@ -46,7 +46,7 @@ public: class KonqProfileDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KonqProfileDlg( KonqViewManager *manager, const TQString &preselectProfile, TQWidget *parent = 0L ); ~KonqProfileDlg(); diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cpp index 8c2a91329..01cff73c6 100644 --- a/konqueror/konq_run.cc +++ b/konqueror/konq_run.cpp @@ -148,10 +148,10 @@ void KonqRun::init() KParts::BrowserRun::init(); // Maybe init went to the "let's try stat'ing" part. Then connect to info messages. // (in case it goes to scanFile, this will be done below) - TDEIO::StatJob *job = tqt_dynamic_cast<TDEIO::StatJob*>( m_job ); + TDEIO::StatJob *job = dynamic_cast<TDEIO::StatJob*>( m_job ); if ( job && !job->error() && m_pView ) { - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); } } @@ -160,13 +160,13 @@ void KonqRun::scanFile() KParts::BrowserRun::scanFile(); // could be a static cast as of now, but who would notify when // BrowserRun changes - TDEIO::TransferJob *job = tqt_dynamic_cast<TDEIO::TransferJob*>( m_job ); + TDEIO::TransferJob *job = dynamic_cast<TDEIO::TransferJob*>( m_job ); if ( job && !job->error() ) { - connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL& )), - TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) )); + connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL& )), + TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) )); if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") { - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); } } } diff --git a/konqueror/konq_run.h b/konqueror/konq_run.h index a5539b993..d5876eed2 100644 --- a/konqueror/konq_run.h +++ b/konqueror/konq_run.h @@ -30,7 +30,7 @@ class KonqView; class KonqRun : public KParts::BrowserRun { - Q_OBJECT + TQ_OBJECT public: /** * Create a KonqRun instance, associated to the main view and an diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cpp index 868b8edc9..0506648ff 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cpp @@ -78,61 +78,61 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon m_pActiveChild = 0L; m_pViewManager = viewManager; - connect( this, TQT_SIGNAL( currentChanged ( TQWidget * ) ), - this, TQT_SLOT( slotCurrentChanged( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( currentChanged ( TQWidget * ) ), + this, TQ_SLOT( slotCurrentChanged( TQWidget* ) ) ); m_pPopupMenu = new TQPopupMenu( this ); m_pPopupMenu->insertItem( SmallIcon( "tab_new" ), i18n("&New Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotAddTab() ), + TQ_SLOT( slotAddTab() ), m_pViewManager->mainWindow()->action("newtab")->shortcut() ); m_pPopupMenu->insertItem( SmallIconSet( "reload" ), i18n( "&Reload Tab" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotReloadPopup() ), + TQ_SLOT( slotReloadPopup() ), m_pViewManager->mainWindow()->action("reload")->shortcut(), RELOAD_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_duplicate" ), i18n("&Duplicate Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotDuplicateTabPopup() ), + TQ_SLOT( slotDuplicateTabPopup() ), m_pViewManager->mainWindow()->action("duplicatecurrenttab")->shortcut(), DUPLICATE_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_breakoff" ), i18n("D&etach Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotBreakOffTabPopup() ), + TQ_SLOT( slotBreakOffTabPopup() ), m_pViewManager->mainWindow()->action("breakoffcurrenttab")->shortcut(), BREAKOFF_ID ); m_pPopupMenu->insertSeparator(); m_pPopupMenu->insertItem( SmallIconSet( "tab_move_left" ), i18n("Move Tab &Left"), m_pViewManager->mainWindow(), - TQT_SLOT( slotMoveTabLeft() ), + TQ_SLOT( slotMoveTabLeft() ), m_pViewManager->mainWindow()->action("tab_move_left")->shortcut(), MOVE_LEFT_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_move_right" ), i18n("Move Tab &Right"), m_pViewManager->mainWindow(), - TQT_SLOT( slotMoveTabRight() ), + TQ_SLOT( slotMoveTabRight() ), m_pViewManager->mainWindow()->action("tab_move_right")->shortcut(), MOVE_RIGHT_ID ); m_pPopupMenu->insertSeparator(); m_pSubPopupMenuTab = new TQPopupMenu( this ); m_pPopupMenu->insertItem( i18n("Other Tabs" ), m_pSubPopupMenuTab, OTHERTABS_ID ); - connect( m_pSubPopupMenuTab, TQT_SIGNAL( activated ( int ) ), - this, TQT_SLOT( slotSubPopupMenuTabActivated( int ) ) ); + connect( m_pSubPopupMenuTab, TQ_SIGNAL( activated ( int ) ), + this, TQ_SLOT( slotSubPopupMenuTabActivated( int ) ) ); m_pPopupMenu->insertSeparator(); m_pPopupMenu->insertItem( SmallIconSet( "tab_remove" ), i18n("&Close Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotRemoveTabPopup() ), + TQ_SLOT( slotRemoveTabPopup() ), m_pViewManager->mainWindow()->action("removecurrenttab")->shortcut(), CLOSETAB_ID ); - connect( this, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), - TQT_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( contextMenu( const TQPoint & ) ), - TQT_SLOT(slotContextMenu( const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), + TQ_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenu( const TQPoint & ) ), + TQ_SLOT(slotContextMenu( const TQPoint & ) ) ); m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab(); @@ -146,14 +146,14 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon setTabCloseActivatePrevious( KonqSettings::tabCloseActivatePrevious() ); if (KonqSettings::tabPosition()=="Bottom") setTabPosition(TQTabWidget::Bottom); - connect( this, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(slotCloseRequest( TQWidget * ))); - connect( this, TQT_SIGNAL( removeTabPopup() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTabPopup() ) ); + connect( this, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(slotCloseRequest( TQWidget * ))); + connect( this, TQ_SIGNAL( removeTabPopup() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTabPopup() ) ); if ( KonqSettings::addTabButton() ) { m_leftWidget = new TQToolButton( this ); - connect( m_leftWidget, TQT_SIGNAL( clicked() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) ); + connect( m_leftWidget, TQ_SIGNAL( clicked() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) ); m_leftWidget->setIconSet( SmallIcon( "tab_new" ) ); m_leftWidget->adjustSize(); TQToolTip::add(m_leftWidget, i18n("Open a new tab")); @@ -161,8 +161,8 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon } if ( KonqSettings::closeTabButton() ) { m_rightWidget = new TQToolButton( this ); - connect( m_rightWidget, TQT_SIGNAL( clicked() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTab() ) ); + connect( m_rightWidget, TQ_SIGNAL( clicked() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTab() ) ); m_rightWidget->setIconSet( SmallIconSet( "tab_remove" ) ); m_rightWidget->adjustSize(); TQToolTip::add(m_rightWidget, i18n("Close the current tab")); @@ -171,23 +171,23 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon setAutomaticResizeTabs( true ); setTabReorderingEnabled( true ); - connect( this, TQT_SIGNAL( movedTab( int, int ) ), - TQT_SLOT( slotMovedTab( int, int ) ) ); - connect( this, TQT_SIGNAL( mouseMiddleClick() ), - TQT_SLOT( slotMouseMiddleClick() ) ); - connect( this, TQT_SIGNAL( mouseMiddleClick( TQWidget * ) ), - TQT_SLOT( slotMouseMiddleClick( TQWidget * ) ) ); - connect( this, TQT_SIGNAL( mouseDoubleClick() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) ); - - connect( this, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), - TQT_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) ); - connect( this, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), - TQT_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) ); - connect( this, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), - TQT_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) ); - connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )), - TQT_SLOT( slotInitiateDrag( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( movedTab( int, int ) ), + TQ_SLOT( slotMovedTab( int, int ) ) ); + connect( this, TQ_SIGNAL( mouseMiddleClick() ), + TQ_SLOT( slotMouseMiddleClick() ) ); + connect( this, TQ_SIGNAL( mouseMiddleClick( TQWidget * ) ), + TQ_SLOT( slotMouseMiddleClick( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( mouseDoubleClick() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) ); + + connect( this, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), + TQ_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) ); + connect( this, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )), + TQ_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) ); + connect( this, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), + TQ_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) ); + connect( this, TQ_SIGNAL( initiateDrag( TQWidget * )), + TQ_SLOT( slotInitiateDrag( TQWidget * ) ) ); setMouseWheelScroll(KonqSettings::tabsCycleWheel()); } @@ -339,7 +339,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame ) void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage ) { setTabColor( newPage, TDEGlobalSettings::textColor() ); - KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>(newPage); + KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>(newPage); if (currentFrame && !m_pViewManager->isLoadingProfile()) { m_pActiveChild = currentFrame; @@ -367,7 +367,7 @@ void KonqFrameTabs::slotMovedTab( int from, int to ) m_pChildFrameList->remove( fromFrame ); m_pChildFrameList->insert( to, fromFrame ); - KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>( currentPage() ); + KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>( currentPage() ); if ( currentFrame && !m_pViewManager->isLoadingProfile() ) { m_pActiveChild = currentFrame; currentFrame->activateChild(); @@ -451,11 +451,11 @@ void KonqFrameTabs::slotContextMenu( TQWidget *w, const TQPoint &p ) m_pPopupMenu->setItemEnabled( OTHERTABS_ID, tabCount>1 ); m_pSubPopupMenuTab->setItemEnabled( m_closeOtherTabsId, true ); - // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a + // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a // class hierarchy and it could crash one day, but I haven't checked // setWorkingTab so I don't know if it can handle nulls. - m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) ); + m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) ); m_pPopupMenu->exec( p ); } @@ -466,7 +466,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab() m_pSubPopupMenuTab->insertItem( SmallIcon( "reload_all_tabs" ), i18n( "&Reload All Tabs" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotReloadAllTabs() ), + TQ_SLOT( slotReloadAllTabs() ), m_pViewManager->mainWindow()->action("reload_all_tabs")->shortcut() ); m_pSubPopupMenuTab->insertSeparator(); for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) @@ -488,15 +488,15 @@ void KonqFrameTabs::refreshSubPopupMenuTab() m_pSubPopupMenuTab->insertItem( SmallIconSet( "tab_remove_other" ), i18n( "Close &Other Tabs" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotRemoveOtherTabsPopup() ), + TQ_SLOT( slotRemoveOtherTabsPopup() ), m_pViewManager->mainWindow()->action("removeothertabs")->shortcut() ); } void KonqFrameTabs::slotCloseRequest( TQWidget *w ) { if ( m_pChildFrameList->count() > 1 ) { - // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. - m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) ); + // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. + m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) ); emit ( removeTabPopup() ); } } @@ -523,8 +523,8 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w ) { if ( m_MouseMiddleClickClosesTab ) { if ( m_pChildFrameList->count() > 1 ) { - // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. - m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) ); + // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. + m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) ); emit ( removeTabPopup() ); } } @@ -532,7 +532,7 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w ) TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection ); KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { - KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w); + KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w); if (frame) { m_pViewManager->mainWindow()->openURL( frame->activeChildView(), filteredURL ); } @@ -562,7 +562,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e ) { KURL::List lstDragURLs; bool ok = KURLDrag::decode( e, lstDragURLs ); - KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w); + KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w); if ( ok && lstDragURLs.first().isValid() && frame ) { KURL lstDragURL = lstDragURLs.first(); if ( lstDragURL != frame->activeChildView()->url() ) @@ -572,7 +572,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e ) void KonqFrameTabs::slotInitiateDrag( TQWidget *w ) { - KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>( w ); + KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>( w ); if (frame) { KURL::List lst; lst.append( frame->activeChildView()->url() ); diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h index f21bf82a9..bfc15dbb0 100644 --- a/konqueror/konq_tabs.h +++ b/konqueror/konq_tabs.h @@ -43,7 +43,7 @@ class TDEAction; class KonqFrameTabs : public KTabWidget, public KonqFrameContainerBase { - Q_OBJECT + TQ_OBJECT friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX public: diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cpp index ecbac60ca..0f809ccd1 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cpp @@ -1,4 +1,4 @@ -/* -*- c-basic-offset: 2 -*- +/* This file is part of the KDE project Copyright (C) 1998-2005 David Faure <faure@kde.org> @@ -127,7 +127,7 @@ KonqView::~KonqView() { finishedWithCurrentURL(); if ( isPassiveMode() ) - disconnect( m_pPart, TQT_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQT_SLOT( slotObjectDestroyed() ) ); + disconnect( m_pPart, TQ_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQ_SLOT( slotObjectDestroyed() ) ); delete m_pPart; } @@ -372,16 +372,16 @@ bool KonqView::changeViewMode( const TQString &serviceType, void KonqView::connectPart( ) { //kdDebug(1202) << "KonqView::connectPart" << endl; - connect( m_pPart, TQT_SIGNAL( started( TDEIO::Job * ) ), - this, TQT_SLOT( slotStarted( TDEIO::Job * ) ) ); - connect( m_pPart, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( m_pPart, TQT_SIGNAL( completed(bool) ), - this, TQT_SLOT( slotCompleted(bool) ) ); - connect( m_pPart, TQT_SIGNAL( canceled( const TQString & ) ), - this, TQT_SLOT( slotCanceled( const TQString & ) ) ); - connect( m_pPart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); + connect( m_pPart, TQ_SIGNAL( started( TDEIO::Job * ) ), + this, TQ_SLOT( slotStarted( TDEIO::Job * ) ) ); + connect( m_pPart, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( m_pPart, TQ_SIGNAL( completed(bool) ), + this, TQ_SLOT( slotCompleted(bool) ) ); + connect( m_pPart, TQ_SIGNAL( canceled( const TQString & ) ), + this, TQ_SLOT( slotCanceled( const TQString & ) ) ); + connect( m_pPart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); KParts::BrowserExtension *ext = browserExtension(); @@ -389,8 +389,8 @@ void KonqView::connectPart( ) { ext->setBrowserInterface( m_browserIface ); - connect( ext, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ), - m_pMainWindow, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( ext, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ), + m_pMainWindow, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); if ( m_bPopupMenuEnabled ) { @@ -398,59 +398,59 @@ void KonqView::connectPart( ) enablePopupMenu( true ); } - connect( ext, TQT_SIGNAL( setLocationBarURL( const TQString & ) ), - this, TQT_SLOT( setLocationBarURL( const TQString & ) ) ); + connect( ext, TQ_SIGNAL( setLocationBarURL( const TQString & ) ), + this, TQ_SLOT( setLocationBarURL( const TQString & ) ) ); - connect( ext, TQT_SIGNAL( setIconURL( const KURL & ) ), - this, TQT_SLOT( setIconURL( const KURL & ) ) ); + connect( ext, TQ_SIGNAL( setIconURL( const KURL & ) ), + this, TQ_SLOT( setIconURL( const KURL & ) ) ); - connect( ext, TQT_SIGNAL( setPageSecurity( int ) ), - this, TQT_SLOT( setPageSecurity( int ) ) ); + connect( ext, TQ_SIGNAL( setPageSecurity( int ) ), + this, TQ_SLOT( setPageSecurity( int ) ) ); - connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) ); + connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) ); - connect( ext, TQT_SIGNAL( loadingProgress( int ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( slotLoadingProgress( int ) ) ); + connect( ext, TQ_SIGNAL( loadingProgress( int ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( slotLoadingProgress( int ) ) ); - connect( ext, TQT_SIGNAL( speedProgress( int ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( slotSpeedProgress( int ) ) ); + connect( ext, TQ_SIGNAL( speedProgress( int ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( slotSpeedProgress( int ) ) ); - connect( ext, TQT_SIGNAL( selectionInfo( const KFileItemList & ) ), - this, TQT_SLOT( slotSelectionInfo( const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( selectionInfo( const KFileItemList & ) ), + this, TQ_SLOT( slotSelectionInfo( const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( mouseOverInfo( const KFileItem * ) ), - this, TQT_SLOT( slotMouseOverInfo( const KFileItem * ) ) ); + connect( ext, TQ_SIGNAL( mouseOverInfo( const KFileItem * ) ), + this, TQ_SLOT( slotMouseOverInfo( const KFileItem * ) ) ); - connect( ext, TQT_SIGNAL( openURLNotify() ), - this, TQT_SLOT( slotOpenURLNotify() ) ); + connect( ext, TQ_SIGNAL( openURLNotify() ), + this, TQ_SLOT( slotOpenURLNotify() ) ); - connect( ext, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( slotEnableAction( const char *, bool ) ) ); + connect( ext, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( slotEnableAction( const char *, bool ) ) ); - connect( ext, TQT_SIGNAL( setActionText( const char *, const TQString& ) ), - this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) ); + connect( ext, TQ_SIGNAL( setActionText( const char *, const TQString& ) ), + this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) ); - connect( ext, TQT_SIGNAL( moveTopLevelWidget( int, int ) ), - this, TQT_SLOT( slotMoveTopLevelWidget( int, int ) ) ); + connect( ext, TQ_SIGNAL( moveTopLevelWidget( int, int ) ), + this, TQ_SLOT( slotMoveTopLevelWidget( int, int ) ) ); - connect( ext, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ), - this, TQT_SLOT( slotResizeTopLevelWidget( int, int ) ) ); + connect( ext, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ), + this, TQ_SLOT( slotResizeTopLevelWidget( int, int ) ) ); - connect( ext, TQT_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ), - this, TQT_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) ); + connect( ext, TQ_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ), + this, TQ_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) ); if (service()->desktopEntryName() != "konq_sidebartng") { - connect( ext, TQT_SIGNAL( infoMessage( const TQString & ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( message( const TQString & ) ) ); + connect( ext, TQ_SIGNAL( infoMessage( const TQString & ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( message( const TQString & ) ) ); connect( ext, - TQT_SIGNAL( addWebSideBar(const KURL&, const TQString&) ), + TQ_SIGNAL( addWebSideBar(const KURL&, const TQString&) ), m_pMainWindow, - TQT_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) ); + TQ_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) ); } callExtensionBoolMethod( "setSaveViewPropertiesLocally(bool)", m_pMainWindow->saveViewPropertiesLocally() ); @@ -472,7 +472,7 @@ void KonqView::connectPart( ) m_pPart->widget()->installEventFilter( this ); - if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) + if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") ) { (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this ); } @@ -480,8 +480,8 @@ void KonqView::connectPart( ) // KonqDirPart signal if ( m_pPart->inherits("KonqDirPart") ) { - connect( m_pPart, TQT_SIGNAL( findOpen( KonqDirPart * ) ), - m_pMainWindow, TQT_SLOT( slotFindOpen( KonqDirPart * ) ) ); + connect( m_pPart, TQ_SIGNAL( findOpen( KonqDirPart * ) ), + m_pMainWindow, TQ_SLOT( slotFindOpen( KonqDirPart * ) ) ); } } @@ -532,9 +532,9 @@ void KonqView::slotStarted( TDEIO::Job * job ) job->setWindow (m_pMainWindow->topLevelWidget ()); } - connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQ_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) ); } } @@ -1097,7 +1097,7 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value ) return false; TQUObject o[ 2 ]; - static_TQUType_bool.set( o + 1, value ); + static_QUType_bool.set( o + 1, value ); obj->tqt_invoke( id, o ); return true; @@ -1114,7 +1114,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value return false; TQUObject o[ 2 ]; - static_TQUType_TQString.set( o + 1, value ); + static_QUType_TQString.set( o + 1, value ); obj->tqt_invoke( id, o ); return true; @@ -1131,7 +1131,7 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value return false; TQUObject o[ 2 ]; - static_TQUType_ptr.set( o + 1, &value ); + static_QUType_ptr.set( o + 1, &value ); obj->tqt_invoke( id, o ); return true; @@ -1165,39 +1165,39 @@ void KonqView::enablePopupMenu( bool b ) if ( b ) { m_bPopupMenuEnabled = true; - connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); } else // disable context popup { m_bPopupMenuEnabled = false; - disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); } enableBackRightClick( m_bBackRightClick ); } @@ -1207,11 +1207,11 @@ void KonqView::enableBackRightClick( bool b ) { m_bBackRightClick = b; if ( b ) - connect( this, TQT_SIGNAL( backRightClick() ), - m_pMainWindow, TQT_SLOT( slotBack() ) ); + connect( this, TQ_SIGNAL( backRightClick() ), + m_pMainWindow, TQ_SLOT( slotBack() ) ); else - disconnect( this, TQT_SIGNAL( backRightClick() ), - m_pMainWindow, TQT_SLOT( slotBack() ) ); + disconnect( this, TQ_SIGNAL( backRightClick() ), + m_pMainWindow, TQ_SLOT( slotBack() ) ); } void KonqView::reparseConfiguration() @@ -1220,7 +1220,7 @@ void KonqView::reparseConfiguration() bool b = KonqSettings::backRightClick(); if ( m_bBackRightClick != b ) { - if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) + if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") ) { (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this ); } @@ -1256,7 +1256,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) if ( !m_pPart ) return false; // kdDebug() << "--" << obj->className() << "--" << e->type() << "--" << endl; - if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) ) + if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() ) { TQDragEnterEvent *ev = static_cast<TQDragEnterEvent *>( e ); @@ -1265,19 +1265,19 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) KURL::List lstDragURLs; bool ok = KURLDrag::decode( ev, lstDragURLs ); - TQObjectList *children = m_pPart->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" ); if ( ok && !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me ev->source() != m_pPart->widget() && children && - children->findRef( TQT_TQOBJECT(ev->source()) ) == -1 ) + children->findRef( ev->source() ) == -1 ) ev->acceptAction(); delete children; } } - else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) ) + else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() ) { TQDropEvent *ev = static_cast<TQDropEvent *>( e ); @@ -1293,7 +1293,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) { if ( e->type() == TQEvent::ContextMenu ) { - TQContextMenuEvent *ev = TQT_TQCONTEXTMENUEVENT( e ); + TQContextMenuEvent *ev = static_cast<TQContextMenuEvent*>( e ); if ( ev->reason() == TQContextMenuEvent::Mouse ) { return true; @@ -1301,16 +1301,16 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) } else if ( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( ev->button() == Qt::RightButton ) + TQMouseEvent *ev = static_cast<TQMouseEvent*>( e ); + if ( ev->button() == TQt::RightButton ) { return true; } } else if ( e->type() == TQEvent::MouseButtonRelease ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( ev->button() == Qt::RightButton ) + TQMouseEvent *ev = static_cast<TQMouseEvent*>( e ); + if ( ev->button() == TQt::RightButton ) { emit backRightClick(); return true; @@ -1318,8 +1318,8 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) } else if ( e->type() == TQEvent::MouseMove ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( ev->state() == Qt::RightButton ) + TQMouseEvent *ev = static_cast<TQMouseEvent*>( e ); + if ( ev->state() == TQt::RightButton ) { obj->removeEventFilter( this ); TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 ); diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index 55f0f1069..2de9fa2c6 100644 --- a/konqueror/konq_view.h +++ b/konqueror/konq_view.h @@ -1,4 +1,4 @@ -/* -*- c-basic-offset: 2 -*- +/* * This file is part of the KDE project * Copyright (C) 1998-2005 David Faure <faure@kde.org> * @@ -64,7 +64,7 @@ struct HistoryEntry */ class KonqView : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cpp index ad075a976..c7ead1d0b 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cpp @@ -1,4 +1,3 @@ -// -*- mode: c++; c-basic-offset: 2 -*- /* This file is part of the KDE project Copyright (C) 1999 Simon Hausmann <hausmann@kde.org> @@ -56,8 +55,8 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow ) m_bLoadingProfile = false; m_activePartChangedTimer = new TQTimer(this); - connect(m_activePartChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitActivePartChanged())); - connect( this, TQT_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQT_SLOT( slotActivePartChanged ( KParts::Part * ) ) ); + connect(m_activePartChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitActivePartChanged())); + connect( this, TQ_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQ_SLOT( slotActivePartChanged ( KParts::Part * ) ) ); } KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQString &serviceName ) @@ -91,7 +90,7 @@ KonqViewManager::~KonqViewManager() clear(); } -KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, +KonqView* KonqViewManager::splitView ( TQt::Orientation orientation, const TQString &serviceType, const TQString &serviceName, bool newOneFirst, bool forceAutoEmbed ) @@ -140,7 +139,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, //kdDebug(1202) << "Create new Container" << endl; KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, parentContainer->widget(), parentContainer ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); parentContainer->insertChildFrame( newContainer, index ); if ( moveNewContainer ) { @@ -201,7 +200,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, return newView; } -KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, +KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation, const TQString &serviceType, const TQString &serviceName, bool newOneFirst ) @@ -232,7 +231,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, m_pMainWindow->removeChildFrame( mainFrame ); KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, m_pMainWindow, 0L); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); m_pMainWindow->insertChildFrame( newContainer ); @@ -287,7 +286,7 @@ void KonqViewManager::convertDocContainer() KonqFrameTabs* newContainer = new KonqFrameTabs( parentContainer->widget() , parentContainer, this); parentContainer->insertChildFrame( newContainer ); - connect( newContainer, TQT_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQT_SLOT(slotCtrlTabPressed()) ); + connect( newContainer, TQ_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQ_SLOT(slotCtrlTabPressed()) ); m_pDocContainer->widget()->reparent( newContainer, pos ); newContainer->insertChildFrame( m_pDocContainer ); @@ -409,7 +408,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag KonqFrameBase* currentFrame; if ( tab == 0L ) - currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); else currentFrame = tab; @@ -450,7 +449,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag else tabContainer->setCurrentPage( tabContainer->count() - 1 ); - KonqFrameBase* duplicatedFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + KonqFrameBase* duplicatedFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); if (duplicatedFrame) duplicatedFrame->copyHistory( currentFrame ); @@ -479,7 +478,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) KonqFrameBase* currentFrame; if ( tab == 0L ) - currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); else currentFrame = tab; @@ -507,7 +506,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) if( newDocContainer && newDocContainer->frameType() == "Tabs") { KonqFrameTabs *kft = static_cast<KonqFrameTabs *>(newDocContainer); - KonqFrameBase *newFrame = tqt_dynamic_cast<KonqFrameBase*>(kft->currentPage()); + KonqFrameBase *newFrame = dynamic_cast<KonqFrameBase*>(kft->currentPage()); if(newFrame) newFrame->copyHistory( currentFrame ); } @@ -552,7 +551,7 @@ void KonqViewManager::removeTab( KonqFrameBase* tab ) if ( tab != 0L ) { currentFrame = tab; } else { - currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); if (!currentFrame) { return; } @@ -621,7 +620,7 @@ void KonqViewManager::removeOtherTabs( KonqFrameBase* tab ) KonqFrameBase *currentFrame; if ( tab == 0L ) - currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); else currentFrame = tab; @@ -883,7 +882,7 @@ void KonqViewManager::slotPassiveModePartDeleted() // Passive mode parts aren't registered to the part manager, // so we have to handle suicidal ones ourselves KParts::ReadOnlyPart * part = const_cast<KParts::ReadOnlyPart *>( static_cast<const KParts::ReadOnlyPart *>( sender() ) ); - disconnect( part, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) ); + disconnect( part, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) ); kdDebug(1202) << "KonqViewManager::slotPassiveModePartDeleted part=" << part << endl; KonqView * view = m_pMainWindow->childView( part ); kdDebug(1202) << "view=" << view << endl; @@ -1039,8 +1038,8 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode ); //kdDebug(1202) << "KonqView created - v=" << v << " v->part()=" << v->part() << endl; - TQObject::connect( v, TQT_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ), - m_pMainWindow, TQT_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) ); + TQObject::connect( v, TQ_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ), + m_pMainWindow, TQ_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) ); m_pMainWindow->insertChildView( v ); @@ -1064,7 +1063,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, else { // Passive views aren't registered, but we still want to detect the suicidal ones - connect( v->part(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) ); + connect( v->part(), TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) ); } //kdDebug(1202) << "KonqViewManager::setupView done" << endl; @@ -1575,14 +1574,14 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, //load container config TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) ); //kdDebug(1202) << "Orientation: " << ostr << endl; - Qt::Orientation o; + TQt::Orientation o; if( ostr == "Vertical" ) - o = Qt::Vertical; + o = TQt::Vertical; else if( ostr == "Horizontal" ) - o = Qt::Horizontal; + o = TQt::Horizontal; else { kdWarning() << "Profile Loading Error: No orientation specified in " << name << endl; - o = Qt::Horizontal; + o = TQt::Horizontal; } TQValueList<int> sizes = @@ -1600,7 +1599,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, else { KonqFrameContainer *newContainer = new KonqFrameContainer( o, parent->widget(), parent ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); int tabindex = -1; if(openAfterCurrentPage && parent->frameType() == "Tabs") // Need to honor it, if possible @@ -1629,7 +1628,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, //kdDebug(1202) << "KonqViewManager::loadItem: Item is a Tabs" << endl; KonqFrameTabs *newContainer = new KonqFrameTabs( parent->widget(), parent, this ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); parent->insertChildFrame( newContainer ); m_pDocContainer = newContainer; @@ -1642,7 +1641,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, loadItem( cfg, newContainer, *it, defaultURL, openURL ); TQWidget* currentPage = newContainer->currentPage(); if (currentPage != 0L) { - KonqView* activeChildView = tqt_dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView(); + KonqView* activeChildView = dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView(); if (activeChildView != 0L) { activeChildView->setCaption( activeChildView->caption() ); activeChildView->setTabIcon( activeChildView->url() ); @@ -1650,7 +1649,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, } } - newContainer->setActiveChild( tqt_dynamic_cast<KonqFrameBase*>(newContainer->page(index)) ); + newContainer->setActiveChild( dynamic_cast<KonqFrameBase*>(newContainer->page(index)) ); newContainer->setCurrentPage( index ); newContainer->show(); @@ -1667,10 +1666,10 @@ void KonqViewManager::setProfiles( TDEActionMenu *profiles ) if ( m_pamProfiles ) { - connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotProfileActivated( int ) ) ); - connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotProfileListAboutToShow() ) ); + connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotProfileActivated( int ) ) ); + connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotProfileListAboutToShow() ) ); } //KonqMainWindow::enableAllActions will call it anyway //profileListDirty(); diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 25e55c5cf..829decc86 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -51,7 +51,7 @@ namespace KParts class KonqViewManager : public KParts::PartManager { - Q_OBJECT + TQ_OBJECT public: KonqViewManager( KonqMainWindow *mainWindow ); ~KonqViewManager(); @@ -68,7 +68,7 @@ public: * * @param newOneFirst if true, move the new view as the first one (left or top) */ - KonqView* splitView( Qt::Orientation orientation, + KonqView* splitView( TQt::Orientation orientation, const TQString & serviceType = TQString::null, const TQString & serviceName = TQString::null, bool newOneFirst = false, bool forceAutoEmbed = false ); @@ -80,7 +80,7 @@ public: * * @param newOneFirst if true, move the new view as the first one (left or top) */ - KonqView* splitWindow( Qt::Orientation orientation, + KonqView* splitWindow( TQt::Orientation orientation, const TQString & serviceType = TQString::null, const TQString & serviceName = TQString::null, bool newOneFirst = false); diff --git a/konqueror/konqbrowser.desktop b/konqueror/konqbrowser.desktop index 30c0ed7bd..1953aed34 100644 --- a/konqueror/konqbrowser.desktop +++ b/konqueror/konqbrowser.desktop @@ -5,89 +5,7 @@ Icon=konqueror X-DocPath=konqueror/index.html Name=Konqueror -Name[bn]=কনকরার -Name[hi]=कॉन्करर -Name[pa]=ਕੋਨਕਿਉਰੋਰ -Name[ta]=கான்கொரர் GenericName=Web Browser -GenericName[af]=Web Blaaier -GenericName[ar]=متصفح الشبكة -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па Сеціве -GenericName[bg]=Уеб браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[br]=Furcher ar Gwiad -GenericName[bs]=WWW Preglednik -GenericName[ca]=Fullejador web -GenericName[cs]=WWW prohlížeč -GenericName[csb]=Przezérnik WWW -GenericName[cy]=Porydd Gwe -GenericName[da]=Browser -GenericName[de]=Internetnavigator -GenericName[el]=Περιηγητής ιστού -GenericName[eo]=TTT-legilo -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fa]=مرورگر وب -GenericName[fi]=WWW-selain -GenericName[fo]=Alnótsfar -GenericName[fr]=Navigateur web -GenericName[fy]=Webblêder -GenericName[ga]=Brabhsálaí Lín -GenericName[gl]=Navegador Web -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Peselancar Web -GenericName[is]=Vafri -GenericName[it]=Browser Web -GenericName[ja]=ウェブブラウザ -GenericName[ka]=ვებ–ბრაუზერი -GenericName[kk]=Веб браузер -GenericName[km]=កម្មវិធីរុករកបណ្ដាញ -GenericName[ko]=웹 브라우저 -GenericName[lo]=ເວັບບຣາວເຊີ -GenericName[lt]=Žiniatinklio naršyklė -GenericName[lv]=Tīmekļa Pārlūks -GenericName[mk]=Прелистувач на Интернет -GenericName[mn]=Веб-Хөтөч -GenericName[ms]=Pelayar Web -GenericName[nb]=Nettleser -GenericName[nds]=Nettkieker -GenericName[ne]=वेब ब्राउजर -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[nso]=Seinyakisi sa Web -GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator de web -GenericName[ru]=Веб-браузер -GenericName[rw]=Mucukumbuzi Urubuga -GenericName[se]=Fierpmádatlogan -GenericName[sk]=Webový prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sr]=Веб прегледач -GenericName[sr@Latn]=Veb pregledač -GenericName[ss]=Ibrawuza yeWeb -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[te]=వెబ్ బ్రౌజర్ -GenericName[tg]=Тафсиргари вэб -GenericName[th]=เว็บบราวเซอร์ -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Навігатор Тенет -GenericName[uz]=Veb-brauzer -GenericName[uz@cyrillic]=Веб-браузер -GenericName[ven]=Buronza ya Webu -GenericName[vi]=Trình duyệt mạng -GenericName[wa]=Betchteu waibe -GenericName[xh]=Umkhangeli zincwadi we Web -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -GenericName[zu]=Umcingi we-Web + Categories=Qt;TDE;Network; diff --git a/konqueror/konqfilemgr.desktop b/konqueror/konqfilemgr.desktop index 0aee8ec0c..5dd61d77a 100644 --- a/konqueror/konqfilemgr.desktop +++ b/konqueror/konqfilemgr.desktop @@ -5,86 +5,3 @@ Icon=kfm X-DocPath=konqueror/index.html Name=File Manager -Name[af]=Lêer Bestuurder -Name[ar]=مدبّر الملفات -Name[az]=Fayl İdarəcisi -Name[be]=Кіраўнік файлаў -Name[bg]=Файлов браузър -Name[bn]=ফাইল ম্যানেজার -Name[br]=Merour restroù -Name[bs]=Upravitelj datotekama -Name[ca]=Gestor de fitxers -Name[cs]=Správce souborů -Name[csb]=Menedżer lopków -Name[cy]=Rheolydd Ffeiliau -Name[da]=Filhåndtering -Name[de]=Dateiverwaltung -Name[el]=Διαχειριστής αρχείων -Name[eo]=Dosieradministrilo -Name[es]=Gestor de archivos -Name[et]=Failihaldur -Name[eu]=Fitxategi kudeatzailea -Name[fa]=مدیر پرونده -Name[fi]=Tiedostonhallinta -Name[fo]=Fíluhandfarari -Name[fr]=Gestionnaire de fichiers -Name[fy]=Triembehearder -Name[ga]=Bainisteoir Comhad -Name[gl]=Xestor de Ficheiros -Name[he]=מנהל הקבצים -Name[hi]=फ़ाइल प्रबंधक -Name[hr]=Upravitelj datotekama -Name[hsb]=Datajowy manager -Name[hu]=Fájlkezelő -Name[id]=Manajer File -Name[is]=Skráastjóri -Name[it]=File manager -Name[ja]=ファイルマネージャ -Name[ka]=ფაილთა მენჯერი -Name[kk]=Файл менеджері -Name[km]=កម្មវិធីគ្រប់គ្រងឯកសារ -Name[ko]=파일 관리자 -Name[lo]=ເຄື່ອງມືການຈັດການແຟ້ມ -Name[lt]=Bylų tvarkyklė -Name[lv]=Failu Menedžeris -Name[mk]=Менаџер на датотеки -Name[mn]=Файл удирдагч -Name[ms]=Pengurus Fail -Name[mt]=Manager tal-Fajls -Name[nb]=Filbehandler -Name[nds]=Dateipleger -Name[ne]=फाइल प्रबन्धक -Name[nl]=Bestandsbeheerder -Name[nn]=Filhandsamar -Name[nso]=Molaodi wa Faele -Name[oc]=Gestionari de fiquièrs -Name[pa]=ਫਾਇਲ ਮੈਨੇਜਰ -Name[pl]=Menedżer plików -Name[pt]=Gestor de Ficheiros -Name[pt_BR]=Gerenciador de Arquivos -Name[ro]=Manager de fișiere -Name[ru]=Файловый менеджер -Name[rw]= Mucungamadosiye -Name[se]=Fiilagieđahalli -Name[sk]=Správca súborov -Name[sl]=Upravitelj datotek -Name[sr]=Менаџер фајлова -Name[sr@Latn]=Menadžer fajlova -Name[ss]=Siphatsi selifayela -Name[sv]=Filhanterare -Name[ta]=கோப்பு மேலாளர் -Name[te]=దస్త్రాల అభికర్త -Name[tg]=Мудири файл -Name[th]=เครื่องมือจัดการแฟ้ม -Name[tr]=Dosya Yöneticisi -Name[tt]=Birem İdäräçe -Name[uk]=Менеджер файлів -Name[uz]=Fayl boshqaruvchisi -Name[uz@cyrillic]=Файл бошқарувчиси -Name[ven]=Mulanguli wa faela -Name[vi]=Trình quản lí tập tin -Name[wa]=Manaedjeu di fitchîs -Name[xh]=Umphathi Wefayile -Name[zh_CN]=文件管理器 -Name[zh_TW]=檔案管理程式 -Name[zu]=imenenja yamafayela diff --git a/konqueror/konqueror.desktop b/konqueror/konqueror.desktop index b7bbf8846..d016bb814 100644 --- a/konqueror/konqueror.desktop +++ b/konqueror/konqueror.desktop @@ -1,95 +1,12 @@ [Desktop Entry] Type=Application NoDisplay=true -Name=Konqueror -Name[bn]=কনকরার -Name[hi]=कॉन्करर -Name[pa]=ਕੋਨਕਿਉਰੋਰ -Name[ta]=கான்கொரர் - Exec=konqueror %U +Name=Konqueror + Comment=TDE File Manager & Web Browser -Comment[af]=Kde Lêer Bestuurder & Web Blaaier -Comment[ar]=مدبِر TDE للملفات و متصفح الشبكة -Comment[az]=TDE Fayl İdarəcisi və İnternet Səyyahı -Comment[be]=Файлавы кіраўнік і вандроўнік па Сеціве для TDE -Comment[bg]=Файлов и уеб браузър -Comment[bn]=কে.ডি.ই ফাইল ম্যানেজার এবং ওয়েব ব্রাউজার -Comment[br]=Merour restroù ha merdeer gwiad TDE -Comment[bs]=TDE upravitelj datotekama & Web preglednik -Comment[ca]=El gestor de fitxers i fullejador Web del TDE -Comment[cs]=Správce souborů a prohlížeč Webu pro prostředí TDE -Comment[csb]=TDE Menedżer lopków ë przezérnik WWW -Comment[cy]=Trefnydd Ffeiliau a Porydd Gwe TDE -Comment[da]=TDE's filhåndtering og netsøgning -Comment[de]=Der Dateiverwalter und Internetnavigator von TDE -Comment[el]=Διαχειριστής αρχείων & Περιηγητής ιστού του TDE -Comment[eo]=TDE-dosieradministrilo kaj TTT-legilo -Comment[es]=Gestor de archivos y navegador web de TDE -Comment[et]=TDE failihaldur & veebilehitseja -Comment[eu]=TDE fitxategi kudeatzailea eta Web arakatzailea -Comment[fa]=مدیر پرونده و مرورگر وب TDE -Comment[fi]=TDE:n tiedostonhallinta ja WWW-selain -Comment[fr]=Gestionnaire de fichiers et navigateur web de TDE -Comment[fy]=TDE's Triembehearder en webblêder -Comment[ga]=Bainisteoir Comhad & Brabhsálaí TDE -Comment[gl]=Xestor de Ficheiros e Navegador Web de TDE -Comment[he]=מנהל הקבצים ודפדפן האינטרנט של TDE -Comment[hi]=केडीई फ़ाइल प्रबंधक व वेब ब्राउज़र -Comment[hr]=TDE upravitelj datotekama i web preglednik -Comment[hu]=TDE fájlkezelő és webböngésző -Comment[id]=Manajer File TDE & browser web -Comment[is]=TDE skráastjóri og vafri -Comment[it]=Il file manager e browser Web di TDE -Comment[ja]=TDE ファイルマネージャ & ウェブブラウザ -Comment[ka]=ფაილური მენეჯერი და ვებ ბრაუზერი -Comment[kk]=TDE файл менеджері және Веб браузері -Comment[km]=កម្មវិធីគ្រប់គ្រងឯកសារ & កម្មវិធីរុករកបណ្ដាញរបស់ TDE -Comment[ko]=TDE 파일 관리자와 웹 브라우저 -Comment[lo]=ຕົວຈັດການແຟ້ມແລະເວ໊ບບາວເຊີ TDE -Comment[lt]=TDE bylų tvarkyklė ir žiniatinklio naršyklė -Comment[lv]=TDE Failu Menedžeris un Web Pārlūks -Comment[mk]=Менаџер на датотеки и веб-прелистувач во TDE -Comment[mn]=КДЭ-н Файл удирдагч ба Вэб-Хөтөч -Comment[ms]=Pengurus Fail TDE & Pelayar Web -Comment[mt]=Manager tal-fajls u Web Browser tal-TDE -Comment[nb]=Filbehandler og nettleser for TDE -Comment[nds]=TDE sien Dateipleger un Nettkieker -Comment[ne]=TDE फाइल प्रबन्धक र वेब ब्राउजर -Comment[nl]=TDE's bestandsbeheerder en webbrowser -Comment[nn]=Filhandsamar og nettlesar for TDE -Comment[nso]=Seinyakisi sa Web & Molaodi wa Faele ya TDE -Comment[oc]=Lo gestionari de fiquièrs e navigador Web TDE -Comment[pa]=TDE ਫਾਇਲ ਮੈਨੇਜਰ ਅਤੇ ਵੈੱਬ ਝਲਕਾਰਾ -Comment[pl]=TDE Menedżer plików i przeglądarka WWW -Comment[pt]=Gestor de ficheiros e navegador na WWW -Comment[pt_BR]=Gerenciador de Arquivos & Navegador Web do TDE -Comment[ro]=Manager de fișiere TDE și navigator de web -Comment[ru]=Файловый менеджер и веб-браузер -Comment[rw]=TDE Mugengadosiye & Mucukumbuzi w'Urubugamakuru -Comment[se]=TDE fiilagieđahalli ja fierpmádatlogan -Comment[sk]=TDE Správca súborov a Web prehliadač -Comment[sl]=Upravitelj datotek za TDE in spletni brskalnik -Comment[sr]=Менаџер фајлова и веб прегледач за TDE -Comment[sr@Latn]=Menadžer fajlova i veb pregledač za TDE -Comment[sv]=TDE:s filhanterare och webbläsare -Comment[ta]=TDE கோப்பு மேலாளர் மற்றும் வலை உலாவி -Comment[te]=కెడిఈ దస్త్ర అభికర్త & వెబ్ బ్రౌజర్ -Comment[tg]=Мудири файл ва мурургари шабакаи TDE -Comment[th]=เครื่องมือจัดการแฟ้มและท่องเว็บของ TDE -Comment[tr]=TDE Dosya Yöneticisi ve İnternet Tarayıcısı -Comment[tt]=TDE Birem-İdäräçe & Web-Gizgeç -Comment[uk]=Менеджер файлів TDE та навігатор Тенет -Comment[uz]=TDE uchun fayl boshqaruvchi va veb-brauzer -Comment[uz@cyrillic]=TDE учун файл бошқарувчи ва веб-браузер -Comment[ven]=Mulanguli wa faela ya TDE & Buronza ya webe -Comment[vi]=Trình quản lí Tập tin và Duyệt mạng TDE -Comment[wa]=Manaedjeu di fitchîs eyet betchteu waibe di TDE -Comment[xh]=Umphathi Wefayile ye TDE & Umkhangeli zincwadi we Web -Comment[zh_CN]=TDE 文件管理器和 Web 浏览器 -Comment[zh_TW]=TDE 檔案管理程式和網頁瀏覽器 -Comment[zu]=Imenenja yamafayela ye-TDE & Umcingi we-Web + Icon=konqueror X-DCOP-ServiceType=multi X-TDE-StartupNotify=true diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg index ec4728e03..041fe4a46 100644 --- a/konqueror/konqueror.kcfg +++ b/konqueror/konqueror.kcfg @@ -45,6 +45,12 @@ <whatsthis>Checking this option will allow files to be renamed by clicking directly on the icon name.</whatsthis> <!-- checked --> </entry> + <entry key="DoubleClickMoveToParent" type="Bool"> + <default>true</default> + <label>Double click on empty area to move to parent folder</label> + <whatsthis>When this option is enabled, double clicking an empty area will navigate to the parent folder.</whatsthis> + <!-- checked --> + </entry> <entry key="ShowDeleteCommand" type="Bool"> <default>true</default> <label>Show 'Delete' menu entries which bypass the trashcan</label> @@ -158,14 +164,14 @@ <whatsthis></whatsthis> <!-- checked --> </entry> -<!-- konq_settings.cc --> +<!-- konq_settings.cpp --> <entry key="WordWrapText" type="Bool"> <!--LIBKONQ--> <default>true</default> <label></label> <whatsthis></whatsthis> <!-- no writeEntry --> </entry> -<!-- konq_tabs.cc --> +<!-- konq_tabs.cpp --> <entry key="MouseMiddleClickClosesTab" type="Bool"> <default>false</default> <label></label> @@ -282,7 +288,7 @@ <whatsthis></whatsthis> <!-- checked --> </entry> -<!-- konq_view.cc --> +<!-- konq_view.cpp --> <entry key="EnableFavicon" type="Bool"> <default>true</default> <label></label> @@ -502,7 +508,7 @@ PATH_JAVA </group> <group name="ModeToolBarServices" > -<!-- konq_mainwindow.cc --> +<!-- konq_mainwindow.cpp --> <entry key="konq_iconview" type="String"> <label></label> <whatsthis></whatsthis> @@ -526,7 +532,7 @@ PATH_JAVA </group> <group name="Notification Messages" > -<!-- advancedTabDialog.cpp konq_mainwindow.cc --> +<!-- advancedTabDialog.cpp konq_mainwindow.cpp --> <entry key="MultipleTabConfirm" type="Bool"> <default>false</default> <label></label> diff --git a/konqueror/konquerorsu.desktop b/konqueror/konquerorsu.desktop index 0709bc5c0..5b35276ff 100644 --- a/konqueror/konquerorsu.desktop +++ b/konqueror/konquerorsu.desktop @@ -6,85 +6,8 @@ Icon=kfm X-TDE-SubstituteUID=true Name=Konqueror + GenericName=File Manager - Super User Mode -GenericName[af]=Lêer Bestuurder - Super Gebruiker Modus -GenericName[ar]=مدبر الملفات - نمط المستخدم الجذري -GenericName[az]=Fayl İdarəçisi - Ali İstifadəçi Modu -GenericName[be]=Кіраўнік файлаў - рэжым адміністратара -GenericName[bg]=Файлов браузър - администратор -GenericName[bn]=ফাইল ম্যানেজার - অ্যাডমিনস্ট্রেটর মোড -GenericName[br]=Merour restroù - Doare gourarveriad -GenericName[bs]=Upravitelj datotekama (Samo za administratora) -GenericName[ca]=Gestor de fitxers (mode superusuari) -GenericName[cs]=Správce souborů - superuživatelský režim -GenericName[csb]=Menedżer lopków - trib sprôwnika -GenericName[cy]=Trefnydd Ffeiliau - Modd Defnyddiwr Uwch -GenericName[da]=Filhåndtering (superbruger-tilstand) -GenericName[de]=Dateiverwaltung (Systemverwaltungsmodus) -GenericName[el]=Διαχειριστής αρχείων - Λειτουργία ως root -GenericName[eo]=Dosieradministrilo (kiel sistemestro) -GenericName[es]=Gestor de archivos - modo superusuario -GenericName[et]=Failihaldur (administraator) -GenericName[eu]=Fitxategi kudeatzailea (root era) -GenericName[fa]=مدیر پرونده - حالت ابرکاربر -GenericName[fi]=Tiedostonhallinta - pääkäyttäjätila -GenericName[fr]=Konqueror (mode superutilisateur) -GenericName[fy]=Triembehearder (yn systeembehearmodus) -GenericName[ga]=Bainisteoir Comhad - Mód Forúsáideora -GenericName[gl]=Xestor de Ficheiros - Modo Super-Usuario -GenericName[he]=מנהל קבצים - מצב משתמש־על -GenericName[hi]=फ़ाइल प्रबंधक- सुपर यूजर मोड -GenericName[hr]=Upravitelj datotekama - za administratora -GenericName[hu]=Fájlkezelő (rendszergazdai mód) -GenericName[is]=Skráastjóri (sem kerfisstjóri) -GenericName[it]=File manager - modalità super utente -GenericName[ja]=ファイルマネージャ - スーパーユーザモード -GenericName[ka]=ფაილური მენეჯერი (root-ის პრივილეგიებით) -GenericName[kk]=Файл менеджері (root құқықлы) -GenericName[km]=កម្មវិធីគ្រប់គ្រងឯកសារ - របៀបអ្នកប្រើជាន់ខ្ពស់ -GenericName[ko]=파일 관리자 - 슈퍼유저 모드 -GenericName[lo]=ຕົວຈັດການແຟ້ມ - ໂຫມດຜູ້ດູແລລະບົບ -GenericName[lt]=Bylų tvarkyklė – super naudotojo veiksena -GenericName[lv]=Failu Pārvaldnieks - Super Lietotāja Režīms -GenericName[mk]=Менаџер на датотеки - режим root -GenericName[mn]=Конкюрор (Системийн удирдлагын-Горим) -GenericName[ms]=Pengurus Fail - Mod Pengguna Super -GenericName[mt]=Manager tal-Fajls (mod Super User) -GenericName[nb]=Filbehandler – superbrukermodus -GenericName[nds]=Dateipleger, Systeempleegbedrief -GenericName[ne]=फाइल प्रबन्धक - सुपर प्रयोगकर्ता मोड -GenericName[nl]=Bestandsbeheerder (in systeembeheermodus) -GenericName[nn]=Filhandsamar – Superbrukarmodus -GenericName[nso]=Molaodi wa Faele - Seripa sa Modirisi yo Maatla -GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ - ਸੁਪਰ ਉਪਭੋਗੀ (ਮੈਨੇਜਰੀ) ਢੰਗ -GenericName[pl]=Menedżer plików - tryb administratora -GenericName[pt]=Gestor de Ficheiros - Modo de Super Utilizador -GenericName[pt_BR]=Gerenciador de Arquivos (Modo Super-Usuário) -GenericName[ro]=Manager de fișiere - mod superutilizator -GenericName[ru]=Менеджер файлов (в режиме администратора) -GenericName[rw]=Mucungadosiye - Uburyo Ukoresha Mukuru -GenericName[se]=Fiilagieđahalli – Supergeavaheaddjemodus -GenericName[sk]=Správca súborov - Super-používateľský mód -GenericName[sl]=Upravitelj datotek (skrbniški način) -GenericName[sr]=Менаџер фајлова — режим супер корисника -GenericName[sr@Latn]=Menadžer fajlova — režim super korisnika -GenericName[sv]=Filhanterare - Administratörsläge -GenericName[ta]=கோப்பு மேலாளர் - மீப்பயனர் முறைமை -GenericName[te]=దస్త్ర అభికర్త - సూపర్ యూజర్ స్థితి -GenericName[tg]=Мудири файл - ҳолати убури корбар -GenericName[th]=ตัวจัดการแฟ้ม - โหมดผู้ดูแลระบบ -GenericName[tr]=Dosya Yöneticisi - Yetkili Kullanıcı -GenericName[tt]=Birem-İdäräçe (root ısulı) -GenericName[uk]=Менеджер файлів (режим адміністратора) -GenericName[uz]=Fayl boshqaruvchisi (root) -GenericName[uz@cyrillic]=Файл бошқарувчиси (root) -GenericName[ven]=Mulanguli wa faela - mushumisi wa muhulwana wa moudu -GenericName[vi]=Trình quản lí Tập tin - Dành cho người quản lý -GenericName[wa]=Manaedjeu di fitchîs - Môde super uzeu (root) -GenericName[xh]=Umphathi Wefayile - Indlela Ephezulu Yomsebenzisi -GenericName[zh_CN]=文件管理器 - 超级用户模式 -GenericName[zh_TW]=檔案總管 - 超級使用者模式 -GenericName[zu]=Imenenja yamafayela - Indlela Yomsebenzisi Omkhulu Categories=Qt;TDE;X-TDE-System-su; OnlyShowIn=TDE; diff --git a/konqueror/kttsplugin/CMakeLists.txt b/konqueror/kttsplugin/CMakeLists.txt index fc3f409fe..a40509bc7 100644 --- a/konqueror/kttsplugin/CMakeLists.txt +++ b/konqueror/kttsplugin/CMakeLists.txt @@ -23,9 +23,16 @@ link_directories( ##### other data ################################ -install( FILES - tdehtmlkttsd.rc tdehtmlkttsd.desktop - DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins ) +tde_create_translated_desktop( + SOURCE tdehtmlkttsd.desktop + DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins + PO_DIR konqueror-desktops +) + +install( + FILES tdehtmlkttsd.rc + DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins +) ##### libtdehtmlkttsdplugin (module) ############## diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index 49d206664..94322e267 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -42,7 +42,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons { (void) new TDEAction( i18n("&Speak Text"), "kttsd", 0, - this, TQT_SLOT(slotReadOut()), + this, TQ_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); } else diff --git a/konqueror/kttsplugin/tdehtmlkttsd.desktop b/konqueror/kttsplugin/tdehtmlkttsd.desktop index 97c250230..2be04f161 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.desktop +++ b/konqueror/kttsplugin/tdehtmlkttsd.desktop @@ -10,68 +10,7 @@ X-TDE-PluginInfo-EnabledByDefault=true X-TDE-ParentApp=konqueror Name=Text-to-Speech -Name[ar]=برنامج مساعد تحويل لفظ النص -Name[be]=Утулка галасавога ўзнаўлення тэксту -Name[bg]=Приставка за синтез на глас -Name[bn]=লেখা-থেকে-বলা প্লাগ-ইন -Name[bs]=Dodatak za izgovaranje teksta -Name[ca]=Endollable de text a veu -Name[cs]=Modul text-na-řeč -Name[csb]=Plugins czëtôrza tekstu -Name[da]=Tekst-til-tale plugin -Name[de]=Sprachausgabe -Name[el]=Πρόσθετο κείμενο σε ομιλία -Name[eo]=Teksto-Paroligilo Kromaĵo -Name[es]=Complemento de Texto-a-Voz -Name[et]=Teksti kõneks muutmise plugin -Name[eu]=Testu-ahotserako plugina -Name[fa]=وصلۀ متن به سخن -Name[fi]=Teksti puheeksi -liitännäinen -Name[fr]=Module de synthèse vocale -Name[fy]=Tekst-ta-spraak-plugin -Name[ga]=Breiseán Téacs-go-Caint -Name[gl]=Plugin de Texto-a-Fala -Name[he]=תוסף טקסט אל דיבור -Name[hr]=Pretvaranje teksta u govor -Name[hu]=Szövegfelolvasó modul -Name[is]=Texti-í-tal íforrit -Name[it]=Plugin lettura del testo (text-to-speech) -Name[ja]=テキスト読み上げプラグイン -Name[ka]=ტექსტის გახმოვანების მოდული -Name[kk]=Дыбыстап оқу модулі -Name[km]=កម្មវិធីជំនួយខាងក្នុង អត្ថបទ-ទៅជា-សម្ដី -Name[ko]=Text-to-Speech -Name[lt]=Teksto vertimo kalba priedas -Name[mk]=Приклучок за текст-во-говор -Name[ms]=Plugin Teks-ke-Tutur -Name[nb]=Programtillegg for tekst-til-tale -Name[nds]=Vörleser-Plugin -Name[ne]=पाठलाई वाक्यमा प्लगइन -Name[nl]=Tekst-tot-spraak-plugin -Name[nn]=Programtillegg for tekst-til-tale -Name[pa]=ਪਾਠ ਤੋਂ ਬੋਲੀ ਪਲੱਗਇਨ -Name[pl]=Wtyczka odczytywania tekstu -Name[pt]='Plugin' de Texto-para-Fala -Name[pt_BR]=Plug-in de Conversão de Fala -Name[ro]=Modul vorbire text -Name[ru]=Зачитывание текста -Name[rw]=Icomeka Umwandiko-ku-Imvugo -Name[sk]=Modul text-na-reč -Name[sl]=Vstavek za pretvorbo besedila v govor -Name[sr]=Прикључак за текст-у-говор -Name[sr@Latn]=Priključak za tekst-u-govor -Name[sv]=Text till tal-insticksprogram -Name[ta]=உரையில் இருந்து பேச்சு சொருகுப்பொருள் -Name[th]=ปลั๊กอิน เปลี่ยนตัวหนังสือเป็นเสียง -Name[tr]=Metinden-Sese Eklentisi -Name[tt]=Yazma-Uquçı Östämä -Name[uk]=Втулок синтезу мовлення з тексту -Name[vi]=Trình bổ sung Chuyển Văn bản thành Tiếng nói -Name[wa]=Tchôke-divins tecse viè parole -Name[zh_CN]=文本到语音插件 -Name[zh_TW]=文字轉換語音外掛程式 Comment=A plugin which enables texts to be read aloud on the web with KTTS -Comment[de]=Eine Erweiterung, welche es ermöglicht Texte im Internet mit KTTS vorlesen zu lassen Icon=kttsd diff --git a/konqueror/kttsplugin/tdehtmlkttsd.h b/konqueror/kttsplugin/tdehtmlkttsd.h index f9e606c16..4c8815fbd 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.h +++ b/konqueror/kttsplugin/tdehtmlkttsd.h @@ -27,7 +27,7 @@ class TDEInstance; */ class TDEHTMLPluginKTTSD : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/konqueror/listview/CMakeLists.txt b/konqueror/listview/CMakeLists.txt index 02ab59564..01fc5f0ec 100644 --- a/konqueror/listview/CMakeLists.txt +++ b/konqueror/listview/CMakeLists.txt @@ -24,10 +24,13 @@ link_directories( ##### other data ################################ -install( FILES +tde_create_translated_desktop( + SOURCE konq_treeview.desktop konq_detailedlistview.desktop konq_textview.desktop konq_infolistview.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR konqueror-desktops +) install( FILES konq_treeview.rc konq_detailedlistview.rc @@ -42,10 +45,10 @@ install( FILES konq_listview.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) set( target konq_listview ) set( ${target}_SRCS - konq_listview.cc konq_listviewwidget.cc konq_listviewitems.cc - konq_treeviewwidget.cc konq_treeviewitem.cc konq_textviewwidget.cc - konq_textviewitem.cc konq_infolistviewwidget.cc - konq_infolistviewitem.cc konq_listviewsettings.kcfgc + konq_listview.cpp konq_listviewwidget.cpp konq_listviewitems.cpp + konq_treeviewwidget.cpp konq_treeviewitem.cpp konq_textviewwidget.cpp + konq_textviewitem.cpp konq_infolistviewwidget.cpp + konq_infolistviewitem.cpp konq_listviewsettings.kcfgc ) tde_add_kpart( ${target} AUTOMOC diff --git a/konqueror/listview/Makefile.am b/konqueror/listview/Makefile.am index 91dd33a10..c190de7df 100644 --- a/konqueror/listview/Makefile.am +++ b/konqueror/listview/Makefile.am @@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = konq_listview.la METASOURCES = AUTO -konq_listview_la_SOURCES = konq_listview.cc \ - konq_listviewwidget.cc konq_listviewitems.cc \ - konq_treeviewwidget.cc konq_treeviewitem.cc \ - konq_textviewwidget.cc konq_textviewitem.cc \ - konq_infolistviewwidget.cc konq_infolistviewitem.cc \ +konq_listview_la_SOURCES = konq_listview.cpp \ + konq_listviewwidget.cpp konq_listviewitems.cpp \ + konq_treeviewwidget.cpp konq_treeviewitem.cpp \ + konq_textviewwidget.cpp konq_textviewitem.cpp \ + konq_infolistviewwidget.cpp konq_infolistviewitem.cpp \ konq_listviewsettings.kcfgc konq_listview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module diff --git a/konqueror/listview/konq_detailedlistview.desktop b/konqueror/listview/konq_detailedlistview.desktop index 2e16d061f..7e03a09fa 100644 --- a/konqueror/listview/konq_detailedlistview.desktop +++ b/konqueror/listview/konq_detailedlistview.desktop @@ -1,84 +1,6 @@ [Desktop Entry] Type=Service Name=Detailed List View -Name[af]=Gedetaileerde Lys Besigtig -Name[ar]=عرض مفصل لوحي -Name[az]=Ətraflı Siyahı Görünüşü -Name[be]=Падрабязны спіс -Name[bg]=Подробен преглед -Name[bn]=বিস্তারিত তালিকা ভিউ -Name[br]=Gwell roll gant munudoù -Name[bs]=Pogled detaljne liste -Name[ca]=Vista de llista detallada -Name[cs]=Detailní pohled -Name[csb]=Wëzdrzatk z akùratną lëstą -Name[cy]=Golwg Rhestr Fanwl -Name[da]=Detaljeret listevisning -Name[de]=Detaillierte Ordneransicht -Name[el]=Προβολή λεπτομερούς λίστας -Name[eo]=Detala listrigardo -Name[es]=Vista de lista detallada -Name[et]=Vaade detailse nimekirjana -Name[eu]=Xehetasundun zerrenda ikuspegia -Name[fa]=نمای فهرست جزئیات -Name[fi]=Yksityiskohtainen listanäkymä -Name[fr]=Liste détaillée -Name[fy]=detaillearre werjefte -Name[ga]=Amharc Liosta Mion -Name[gl]=Vista en Lista Detallada -Name[he]=תצוגת פרטים -Name[hi]=विस्तृत सूची दृश्य -Name[hr]=Detaljan prikaz -Name[hu]=Lista (részletes) -Name[id]=Tampilan list secara detail -Name[is]=Ýtarleg sýn, listi -Name[it]=Vista a lista dettagliata -Name[ja]=詳細なリストビュー -Name[ka]=დაწვრილებითი დიის ხილვა -Name[kk]=Егжей-тегжейлі тізім -Name[km]=ទិដ្ឋភាពបញ្ជីលម្អិត -Name[lo]=ມຸມມອງແບບລາບລະອງດ -Name[lt]=Rodyti detalų sąrašą -Name[lv]=Detalizēta saraksta skatījums -Name[mk]=Преглед со детална листа -Name[mn]=Нарийвчилсан жагсаалтаар харах -Name[ms]=Paparan Senarai Terperinci -Name[mt]=Uri Lista Dettaljata -Name[nb]=Detaljert listevisning -Name[nds]=Detailleerte List -Name[ne]=विस्तृत सूची दृश्य -Name[nl]=Gedetailleerde weergave -Name[nn]=Detaljert listevising -Name[nso]=Pono yeo e Tseneletsego ya Palo -Name[pa]=ਵੇਰਵਾ ਸੂਚੀ ਝਲਕ -Name[pl]=Widok ze szczegółową listą -Name[pt]=Vista em Lista Detalhada -Name[pt_BR]=Visão de Lista Detalhada -Name[ro]=Vizualizare listă detaliată -Name[ru]=В виде подробного списка -Name[rw]=Igaragaza ry'Urutonde Rusesenguye -Name[se]=Bienalaš listočájeheapmi -Name[sk]=Detailný zoznam -Name[sl]=Pogled podrobnega seznama -Name[sr]=Детаљан приказ (листа) -Name[sr@Latn]=Detaljan prikaz (lista) -Name[sv]=Detaljerad listvy -Name[ta]=விவரமான பட்டியல் காட்சி -Name[te]=వివరణాత్మక జాబితా వీక్షణం -Name[tg]=Ба намуди саҳифаи ҷузъиёт -Name[th]=มุมมองแบบรายละเอียด -Name[tr]=Ayrıntılı Liste Görünümü -Name[tt]=Täfsille Tezmädä Küreneş -Name[uk]=Детальний вигляд списком -Name[uz]=Batafsil roʻyxat koʻrinishida -Name[uz@cyrillic]=Батафсил рўйхат кўринишида -Name[ven]=Mbonalelo ya mutevhe wo bviselwaho khagala -Name[vi]=Xem kiểu Danh sách Đầy đủ -Name[wa]=Vey en ene sipepieuse djivêye -Name[xh]=Imboniselo Yoluhlu Oluneenkcukacha -Name[zh_CN]=细节列表视图 -Name[zh_TW]=詳細的清單檢視 -Name[zu]=Umbukiso Woluhlu Oluneminingwane MimeType=inode/directory X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=konq_listview diff --git a/konqueror/listview/konq_detailedlistview.rc b/konqueror/listview/konq_detailedlistview.rc index 593e7f027..06c9bc318 100644 --- a/konqueror/listview/konq_detailedlistview.rc +++ b/konqueror/listview/konq_detailedlistview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KonqDetailedListView" version="11"> +<kpartgui name="KonqDetailedListView" version="13"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Menu name="selection"><text>Selection</text> @@ -24,8 +24,17 @@ </Menu> <Separator/> <Action name="show_dot"/> - <Action name="sort_caseinsensitive"/> - <!--<Action name="sort_directoriesfirst" /> TODO --> + <Menu name="sort"><text>&Sort</text> + <Action name="order_unicode_based"/> + <Action name="order_unicode_based_case_insensitive"/> + <Action name="order_locale_based"/> + <Separator/> + <Action name="group_directories_first"/> + <Action name="group_hidden_first"/> + <Separator/> + <Action name="alternate_sort_order"/> + <Action name="reverse_sort_order"/> + </Menu> <Menu name="listview_show"><text>Show Details</text> <TearOffHandle /> <Action name="show_size"/> diff --git a/konqueror/listview/konq_infolistview.desktop b/konqueror/listview/konq_infolistview.desktop index b076af7db..8882da415 100644 --- a/konqueror/listview/konq_infolistview.desktop +++ b/konqueror/listview/konq_infolistview.desktop @@ -1,82 +1,6 @@ [Desktop Entry] Type=Service Name=Info List View -Name[af]=Inligting Lys Besigtig -Name[ar]=عرض معلومات لوحي -Name[az]=Məlumat Siyahı Görünüşü -Name[be]=Інфармацыйны спіс -Name[bg]=Информационен преглед -Name[bn]=তথ্য তালিকা ভিউ -Name[bs]=Pogled info liste -Name[ca]=Vista de llista informativa -Name[cs]=Pohled s informačním seznamem -Name[csb]=Wëzdrzatk wëdowiédny lëstë -Name[cy]=Golwg Rhestr Gwybodaeth -Name[da]=Info-listevisning -Name[de]=Infolistenansicht -Name[el]=Προβολή λίστας πληροφοριών -Name[eo]=Inforigardo -Name[es]=Vista de lista de información -Name[et]=Infonimekirja vaade -Name[eu]=Info zerrenda ikuspegia -Name[fa]=نمای فهرست اطلاعات -Name[fi]=Infolistanäkymä -Name[fr]=Affichage de liste info -Name[fy]=Ynfolistwerjefte -Name[ga]=Amharc Liosta Eolais -Name[gl]=Vista en Lista Informativa -Name[he]=תצוגת רשימה -Name[hi]=जानकारी सूची दृश्य -Name[hr]=Prikaz info-popisa -Name[hu]=Lista (rövid) -Name[is]=Upplýsingalisti -Name[it]=Vista informazioni -Name[ja]=情報リストビュー -Name[ka]=სია აღწერით -Name[kk]=Мәліметті тізім -Name[km]=ទិដ្ឋភាពព័ត៌មានលម្អិត -Name[lo]=ມຸມມອງແບບໄອຄອນ -Name[lt]=Rodyti info sąrašą -Name[lv]=Info saraksta skatījums -Name[mk]=Преглед со инфо. листа -Name[mn]=Мэд. жагсаалтаар харах -Name[ms]=Paparan Senarai Maklumat -Name[mt]=Lista info. -Name[nb]=Infolistevisning -Name[nds]=Infolistansicht -Name[ne]=सूचना सूची दृश्य -Name[nl]=Infolijstweergave -Name[nn]=Infolistevising -Name[nso]=Pono ya Palo ya Tshedimoso -Name[pa]=ਜਾਣਕਾਰੀ ਸੂਚੀ ਝਲਕ -Name[pl]=Widok listy informacyjnej -Name[pt]=Vista em Lista com Informações -Name[pt_BR]=Visão de Lista de Informações -Name[ro]=Vizualizare listă de informații -Name[ru]=В виде списка с описанием -Name[rw]=Igaragaza Urutonde Amakuru -Name[se]=Diehtolistočájeheapmi -Name[sk]=Zoznam s informáciami -Name[sl]=Pogled seznama z informacijami -Name[sr]=Приказ инфо листе -Name[sr@Latn]=Prikaz info liste -Name[sv]=Info-listvy -Name[ta]=தகவல் பட்டியல் காட்சி -Name[te]=సమాచార జాబితా వీక్షణం -Name[tg]=Ба намуди саҳифаи иттилоот -Name[th]=มุมมองแบบรายการข้อมูล -Name[tr]=Bilgi Listesi Görünümü -Name[tt]=Qısqa Tezmädäy Küreneş -Name[uk]=Вигляд з інформацією про зміст -Name[uz]=Maʼlumotli roʻyxat koʻrinishida -Name[uz@cyrillic]=Маълумотли рўйхат кўринишида -Name[ven]=Mbonalelo ya mutevhe wa mafhungo -Name[vi]=Xem kiểu Danh sách Thông tin -Name[wa]=Vey les informåcions en ene djivêye -Name[xh]=Imboniselo Yoluhlu Lolwazi -Name[zh_CN]=信息列表视图 -Name[zh_TW]=資訊清單檢視 -Name[zu]=Umbukiso wohlu lolwazi MimeType=inode/directory X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=konq_listview diff --git a/konqueror/listview/konq_infolistview.rc b/konqueror/listview/konq_infolistview.rc index 280b2d0ce..60f511b1f 100644 --- a/konqueror/listview/konq_infolistview.rc +++ b/konqueror/listview/konq_infolistview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KonqInfoListView" version="12"> +<kpartgui name="KonqInfoListView" version="14"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Menu name="selection"><text>Selection</text> @@ -24,8 +24,17 @@ </Menu> <Separator/> <Action name="show_dot"/> - <Action name="sort_caseinsensitive"/> - <!--<Action name="sort_directoriesfirst" /> TODO --> + <Menu name="sort"><text>&Sort</text> + <Action name="order_unicode_based"/> + <Action name="order_unicode_based_case_insensitive"/> + <Action name="order_locale_based"/> + <Separator/> + <Action name="group_directories_first"/> + <Action name="group_hidden_first"/> + <Separator/> + <Action name="alternate_sort_order"/> + <Action name="reverse_sort_order"/> + </Menu> <Action name="view_as"/> <Separator/> <Action name="bgsettings"/> diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cpp index 18efb3f8f..f945333b8 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cpp @@ -218,7 +218,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); TDEListView *lv = static_cast< TDEListView* >( listView() ); - const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cpp index e835f1cb3..8ec62c79a 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cpp @@ -37,8 +37,8 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, { m_metaInfoJob = 0; - m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelectMimeType()), + m_mtSelector = new TDESelectAction(i18n("View &As"), 0, this, + TQ_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); kdDebug(1203) << "created info list view\n"; @@ -237,10 +237,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) else { m_metaInfoJob = TDEIO::fileMetaInfo(list); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); } } @@ -257,10 +257,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list) else { m_metaInfoJob = TDEIO::fileMetaInfo(list); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); } KonqBaseListViewWidget::slotRefreshItems(list); } @@ -313,10 +313,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult() else { m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); m_metaInfoTodo.clear(); } } diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index 258a20090..07cede196 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -35,7 +35,7 @@ class TDESelectAction; class KonqInfoListViewWidget : public KonqBaseListViewWidget { // friend class KonqTextViewItem; - Q_OBJECT + TQ_OBJECT public: KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqInfoListViewWidget(); diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cpp index 67da49c6d..6a0d58973 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cpp @@ -48,6 +48,8 @@ #include <unistd.h> #include <kinstance.h> +#include <konq_sort_constants.h> + KonqListViewFactory::KonqListViewFactory() { s_instance = 0; @@ -268,6 +270,8 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char m_mimeTypeResolver = new KMimeTypeResolver<KonqBaseListViewItem,KonqListView>(this); setXMLFile( xmlFile ); + m_sortColumnIndexPrimary = 0; + m_sortColumnIndexAlternate = 1; setupActions(); @@ -285,21 +289,20 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char // Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/ m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType); + connect( m_pListView, TQ_SIGNAL( selectionChanged() ), + m_extension, TQ_SLOT( updateActions() ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); - connect( m_pListView, TQT_SIGNAL( selectionChanged() ), - m_extension, TQT_SLOT( updateActions() ) ); - connect( m_pListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - - connect( m_pListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), - m_extension, TQT_SLOT( updateActions() ) ); - connect(m_pListView->header(),TQT_SIGNAL(indexChange(int,int,int)),this,TQT_SLOT(headerDragged(int,int,int))); - connect(m_pListView->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotHeaderClicked(int))); - connect(m_pListView->header(),TQT_SIGNAL(sizeChange(int,int,int)),TQT_SLOT(slotHeaderSizeChanged())); + connect( m_pListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + m_extension, TQ_SLOT( updateActions() ) ); + connect(m_pListView->header(),TQ_SIGNAL(indexChange(int,int,int)),this,TQ_SLOT(headerDragged(int,int,int))); + connect(m_pListView->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotHeaderClicked(int))); + connect(m_pListView->header(),TQ_SIGNAL(sizeChange(int,int,int)),TQ_SLOT(slotHeaderSizeChanged())); // signals from konqdirpart (for BC reasons) - connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); - connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); + connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) ); + connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) ); loadPlugins( this, this, instance() ); } @@ -538,6 +541,9 @@ void KonqListView::slotColumnToggled() // Update column sizes slotHeaderSizeChanged(); + + // Columns may have been rearranged, so do this to be safe: + resetSortConfig(); } void KonqListView::slotHeaderClicked(int sec) @@ -560,21 +566,230 @@ void KonqListView::slotHeaderClicked(int sec) m_pListView->setAscending(TRUE); } else + { m_pListView->setAscending(!m_pListView->ascending()); + } + checkSortConfig() ; KonqListViewSettings config( m_pListView->url().protocol() ); config.readConfig(); + + if (sec == m_sortColumnIndexPrimary) { + kdDebug(1202)<<"Changing sort order on primary sort column"<<endl; + m_sortColumnOrderPrimary = m_pListView->ascending(); + config.setPrimarySortOrder(m_pListView->ascending()); + } + else if (sec == m_sortColumnIndexAlternate) { + kdDebug(1202)<<"Changing sort order on alternate sort column"<<endl; + m_sortColumnOrderAlternate = m_pListView->ascending(); + config.setAlternateSortOrder(m_pListView->ascending()); + } + else if ( toggleColumnAlternate ) { + kdDebug(1202)<<"Setting new alternate sort column"<<endl; + m_sortColumnNameAlternate = nameOfSortColumn; + m_sortColumnIndexAlternate = sec; + m_sortColumnOrderAlternate = true; + config.setAlternateSortCol(nameOfSortColumn); + config.setAlternateSortIndex(sec); + config.setAlternateSortOrder(true); + toggleColumnAlternate = false; + } + else { + kdDebug(1202)<<"Setting new primary sort column"<<endl; + m_sortColumnNamePrimary = nameOfSortColumn; + m_sortColumnIndexPrimary = sec; + m_sortColumnOrderPrimary = true; + config.setPrimarySortCol(nameOfSortColumn); + config.setPrimarySortIndex(sec); + config.setPrimarySortOrder(true); + toggleColumnAlternate = true; + } + config.setSortBy( nameOfSortColumn ); config.setSortOrder( m_pListView->ascending() ); config.writeConfig(); } +void KonqListView::resetSortConfig() +{ + int defaultVisibleColumn; + int columnNumber; + + defaultVisibleColumn = 0; // First visible column from left + columnNumber = -1; + for (uint i = 0; i < m_pListView->NumberOfAtoms; i++) { + if (m_pListView->confColumns[i].displayInColumn == defaultVisibleColumn) { + columnNumber = i; + } + } + if (columnNumber == -1) { + // This should not happen! + kdDebug() << "We did not find columnNumber" <<endl; + m_sortColumnIndexPrimary = 0; + m_sortColumnNamePrimary = "FileName"; + } + else { + m_sortColumnIndexPrimary = defaultVisibleColumn; + m_sortColumnNamePrimary = m_pListView->confColumns[columnNumber].desktopFileName; + } + + defaultVisibleColumn = 1 ; // Second visible column from left + columnNumber = -1; + for (uint i = 0; i < m_pListView->NumberOfAtoms; i++) { + if (m_pListView->confColumns[i].displayInColumn == defaultVisibleColumn) { + columnNumber = i; + } + } + if (columnNumber == -1) { + // This should not happen! + kdDebug() << "We did not find columnNumber" <<endl; + m_sortColumnIndexAlternate = 0; + m_sortColumnNameAlternate = "FileName"; + } + else { + m_sortColumnIndexAlternate = defaultVisibleColumn; + m_sortColumnNameAlternate=m_pListView->confColumns[columnNumber].desktopFileName; + } + + m_sortColumnOrderPrimary = true ; + m_sortColumnOrderAlternate = true ; + + kdDebug(1202) << "Initialized m_sortColumnIndexPrimary to " <<m_sortColumnIndexPrimary <<endl; + kdDebug(1202) << "Initialized m_sortColumnNamePrimary to " <<m_sortColumnNamePrimary <<endl; + kdDebug(1202) << "Initialized m_sortColumnIndexAlternate to " <<m_sortColumnIndexAlternate <<endl; + kdDebug(1202) << "Initialized m_sortColumnNameAlternate to " <<m_sortColumnNameAlternate <<endl; + + KonqListViewSettings config( m_pListView->url().protocol() ); + config.setPrimarySortCol(m_sortColumnNamePrimary); + config.setPrimarySortIndex(m_sortColumnIndexPrimary); + config.setPrimarySortOrder(m_sortColumnOrderPrimary); + config.setAlternateSortCol(m_sortColumnNameAlternate); + config.setAlternateSortIndex(m_sortColumnIndexAlternate); + config.setAlternateSortOrder(m_sortColumnOrderAlternate); + config.writeConfig() ; +} + +void KonqListView::checkSortConfig() +{ + KonqListViewSettings config( m_pListView->url().protocol() ); + config.readConfig(); + + m_sortColumnIndexPrimary = config.primarySortIndex(); + m_sortColumnNamePrimary = config.primarySortCol(); + m_sortColumnOrderPrimary = config.primarySortOrder(); + + m_sortColumnIndexAlternate = config.alternateSortIndex(); + m_sortColumnNameAlternate = config.alternateSortCol(); + m_sortColumnOrderAlternate = config.alternateSortOrder(); + + if (m_sortColumnIndexPrimary >= 0 && m_sortColumnIndexAlternate >= 0) + return ; + + resetSortConfig(); +} + +#define LV_SORT_CHANGE_COLUMN 1 +#define LV_SORT_CHANGE_ORDER 2 + +void KonqListView::sortListView(uint which) +{ + TQString sortColumnNameCurrent = m_pListView->sortedByColumn; + if (sortColumnNameCurrent == "" ) { + sortColumnNameCurrent = "FileName" ; + m_pListView->sortedByColumn = sortColumnNameCurrent ; + } + TQString sortColumnNameNext; + int sortColumnIndex; + bool sortOrder; + + checkSortConfig() ; + KonqListViewSettings config( m_pListView->url().protocol() ); + config.readConfig(); + + switch (which) + { + case LV_SORT_CHANGE_COLUMN: + if (m_sortColumnNamePrimary == sortColumnNameCurrent) + { + sortColumnNameNext = m_sortColumnNameAlternate; + sortColumnIndex = m_sortColumnIndexAlternate; + sortOrder = m_sortColumnOrderAlternate; + kdDebug(1202) << "Changing sort column to alternate"<<endl ; + } + else + { + sortColumnNameNext = m_sortColumnNamePrimary; + sortColumnIndex = m_sortColumnIndexPrimary; + sortOrder = m_sortColumnOrderPrimary; + kdDebug(1202) << "Changing sort column to primary"<<endl ; + } + m_pListView->setSorting( sortColumnIndex, sortOrder ); + m_pListView->sortedByColumn = sortColumnNameNext; + config.setSortBy( sortColumnNameNext ); + break; + + case LV_SORT_CHANGE_ORDER: + sortOrder = !m_pListView->ascending(); + + if ( m_sortColumnNamePrimary == sortColumnNameCurrent ) + { + sortColumnIndex = m_sortColumnIndexPrimary; + m_sortColumnOrderPrimary = sortOrder; + config.setPrimarySortOrder( sortOrder ); + kdDebug(1202) << "Changing sort order of primary"<<endl ; + } + else + { + sortColumnIndex = m_sortColumnIndexAlternate; + m_sortColumnOrderAlternate = sortOrder ; + config.setAlternateSortOrder( sortOrder ) ; + kdDebug(1202) << "Changing sort order of alternate"<<endl ; + } + m_pListView->setAscending(sortOrder) ; + config.setSortOrder(sortOrder); + m_pListView->setSorting( sortColumnIndex, sortOrder ); + break; + + default: + // Do nothing in case of invalid call + return; + } + + m_pListView->sort(); + + config.writeConfig(); +} + +void KonqListView::slotSortAlternate() +{ + KonqListView::sortListView(LV_SORT_CHANGE_COLUMN); +} + +void KonqListView::slotSortReverse() +{ + KonqListView::sortListView(LV_SORT_CHANGE_ORDER); +} + +void KonqListView::slotToggleDisplayDirectoriesFirst() +{ + m_pProps->setDirsFirst( m_paDisplayDirectoriesFirst->isChecked() ); + m_pListView->updateListContents(); + m_pListView->sort(); +} + +void KonqListView::slotToggleDisplayHiddenFirst() +{ + m_pProps->setHiddenFirst( m_paDisplayHiddenFirst->isChecked() ); + m_pListView->updateListContents(); + m_pListView->sort(); +} + void KonqListView::headerDragged(int sec, int from, int to) { kdDebug(1202)<<"section: "<<sec<<" fromIndex: "<<from<<" toIndex "<<to<<endl; //at this point the columns aren't moved yet, so I let the listview //rearrange the stuff and use a single shot timer - TQTimer::singleShot(200,this,TQT_SLOT(slotSaveAfterHeaderDrag())); + TQTimer::singleShot(200,this,TQ_SLOT(slotSaveAfterHeaderDrag())); } const KFileItem * KonqListView::currentItem() @@ -609,6 +824,9 @@ void KonqListView::slotSaveAfterHeaderDrag() // Update column sizes slotHeaderSizeChanged(); + + // Columns were rearranged, so do this to be safe: + resetSortConfig(); } void KonqListView::slotSaveColumnWidths() @@ -645,7 +863,7 @@ void KonqListView::slotHeaderSizeChanged() if ( !m_headerTimer ) { m_headerTimer = new TQTimer( this ); - connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) ); + connect( m_headerTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSaveColumnWidths() ) ); } else m_headerTimer->stop(); @@ -667,33 +885,33 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQ_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); m_paShowTime->setCheckedState(i18n("Hide &Modification Time")); - m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); m_paShowType->setCheckedState(i18n("Hide &File Type")); - m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); m_paShowMimeType->setCheckedState(i18n("Hide MimeType")); - m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time")); - m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time")); - m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination")); - m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); m_paShowSize->setCheckedState(i18n("Hide Filesize")); - m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); m_paShowOwner->setCheckedState(i18n("Hide Owner")); - m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); m_paShowGroup->setCheckedState(i18n("Hide Group")); - m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); m_paShowPermissions->setCheckedState(i18n("Hide Permissions")); - m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" ); + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" ); + m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); // These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts // can be set from the 'Configure Shortcuts..." dialog. @@ -711,9 +929,53 @@ void KonqListView::setupActions() m_paRenameMovePrev->setToolTip( i18n("Complete rename operation and move the previous item")); m_paRenameMovePrev->setEnabled(false); - m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); - m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + + m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQ_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + + m_paSortAlternate = new TDEAction( i18n( "&Alternate Sort Order" ), CTRL+Key_S, this, + TQ_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order"); + m_paSortAlternate->setToolTip( i18n( "Sort by PREVIOUS sort column" ) ); + m_paSortReverse = new TDEAction( i18n( "&Reverse Sort Order" ), CTRL+Key_R, this, + TQ_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order"); + m_paSortReverse->setToolTip( i18n( "Reverse sort order of current sort column" ) ); + + /* + Build View->Sort submenu interface to properties + SortOrder, SortDirsFirst & SortHiddenFirst + */ + TextSortOrder initialOrder = m_pProps->getSortOrder(); + + m_paOrderUnicodeUnmodified = new TDEToggleAction( i18n( "&Unicode based" ), ALT+Key_1, this, + TQ_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" ); + m_paOrderUnicodeUnmodified->setToolTip( i18n( "Strict numeric Unicode based order" ) ); + m_paOrderUnicodeUnmodified->setChecked( initialOrder == UNICODE_UNMODIFIED ); + + m_paOrderUnicodeCaseInsensitive = new TDEToggleAction( i18n( "Unicode based, &case insensitive" ), ALT+Key_2, this, + TQ_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" ); + m_paOrderUnicodeCaseInsensitive->setToolTip( i18n( "Unicode based order but with lower/upper case ASCII letters adjacent" ) ); + m_paOrderUnicodeCaseInsensitive->setChecked(initialOrder == UNICODE_CASEINSENSITIVE); + + m_paOrderLocale = new TDEToggleAction( i18n( "&Locale based" ), ALT+Key_3, this, + TQ_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" ); + m_paOrderLocale->setToolTip( i18n( "Locale based order, usually \"friendly\"" ) ); + m_paOrderLocale->setChecked(initialOrder == LOCALE_UNMODIFIED); + + // Convert above 3 checkbox menu items into single 3-way radio button menu item + m_paOrderUnicodeUnmodified->setExclusiveGroup( "sortOrder" ); + m_paOrderUnicodeCaseInsensitive->setExclusiveGroup( "sortOrder" ); + m_paOrderLocale->setExclusiveGroup( "sortOrder" ); + + m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), CTRL+SHIFT+Key_F, this, + TQ_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first"); + m_paDisplayDirectoriesFirst->setToolTip( i18n( "Always display directories before non-directories" ) ); + m_paDisplayDirectoriesFirst->setChecked(m_pProps->isDirsFirst()); + + m_paDisplayHiddenFirst = new TDEToggleAction( i18n("Group &Hidden First"), CTRL+SHIFT+Key_H, this, + TQ_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first"); + m_paDisplayHiddenFirst->setToolTip( i18n( "Always display hidden files before non-hidden files" ) ); + m_paDisplayHiddenFirst->setChecked(m_pProps->isHiddenFirst()); newIconSize( TDEIcon::SizeSmall /* default size */ ); } @@ -726,6 +988,32 @@ void KonqListView::slotSelectionChanged() // m_paInvertSelection->setEnabled( itemSelected ); } -#include "konq_listview.moc" +void KonqListView::slotOrderUnicodeUnmodified() +{ + TextSortOrder sortOrder = UNICODE_UNMODIFIED ; + kdDebug(1202) << "Setting name order = " << sortOrder << endl; + m_pProps->setSortOrder( sortOrder ); + m_pListView->m_sortOrder = sortOrder; + m_pListView->sort(); +} + +void KonqListView::slotOrderUnicodeCaseInsensitive() +{ + TextSortOrder sortOrder = UNICODE_CASEINSENSITIVE; + kdDebug(1202) << "Setting name order = " << sortOrder << endl; + m_pProps->setSortOrder( sortOrder ); + m_pListView->m_sortOrder = sortOrder; + m_pListView->sort(); +} +void KonqListView::slotOrderLocale() +{ + TextSortOrder sortOrder = LOCALE_UNMODIFIED; + kdDebug(1202) << "Setting name order = " << sortOrder << endl; + m_pProps->setSortOrder( sortOrder ); + m_pListView->m_sortOrder = sortOrder; + m_pListView->sort(); +} + +#include "konq_listview.moc" diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 4c3719bd0..bcd2ec0a1 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -63,8 +63,10 @@ class KonqListView : public KonqDirPart { friend class KonqBaseListViewWidget; friend class ListViewBrowserExtension; - Q_OBJECT + + TQ_OBJECT TQ_PROPERTY( bool supportsUndo READ supportsUndo ) + public: KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqListView(); @@ -128,6 +130,15 @@ protected slots: void slotSaveColumnWidths(); // delayed void slotHeaderClicked(int sec); + void slotOrderUnicodeUnmodified(); + void slotOrderUnicodeCaseInsensitive(); + void slotOrderLocale(); + void slotToggleDisplayDirectoriesFirst(); + void slotToggleDisplayHiddenFirst(); + + void slotSortAlternate(); + void slotSortReverse(); + // This comes from KonqDirPart, it's for the "Find" feature virtual void slotStarted() { m_pListView->slotStarted(); } virtual void slotCanceled() { m_pListView->slotCanceled(); } @@ -148,12 +159,27 @@ private: KMimeTypeResolver<KonqBaseListViewItem,KonqListView> *m_mimeTypeResolver; TQTimer *m_headerTimer; + bool toggleColumnAlternate = true; + TQString m_sortColumnNamePrimary; + int m_sortColumnIndexPrimary; + int m_sortColumnOrderPrimary; + TQString m_sortColumnNameAlternate; + int m_sortColumnIndexAlternate; + int m_sortColumnOrderAlternate; + + void resetSortConfig(); + void checkSortConfig(); + void sortListView(uint which); + TDEAction *m_paSelect; TDEAction *m_paUnselect; TDEAction *m_paSelectAll; TDEAction *m_paUnselectAll; TDEAction *m_paInvertSelection; + TDEAction *m_paSortAlternate; + TDEAction *m_paSortReverse; + // These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts // can be set from the 'Configure Shortcuts..." dialog. // The real actions are performed in the TDEListViewLineEdit::keyPressEvent() in tdeui @@ -174,11 +200,18 @@ private: TDEToggleAction *m_paShowGroup; TDEToggleAction *m_paShowPermissions; TDEToggleAction *m_paShowURL; + + TDEToggleAction *m_paOrderUnicodeUnmodified; + TDEToggleAction *m_paOrderUnicodeCaseInsensitive; + TDEToggleAction *m_paOrderLocale; + + TDEToggleAction *m_paDisplayDirectoriesFirst; + TDEToggleAction *m_paDisplayHiddenFirst; }; class ListViewBrowserExtension : public KonqDirPartBrowserExtension { - Q_OBJECT + TQ_OBJECT friend class KonqListView; friend class KonqBaseListViewWidget; public: diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg index bce9798a6..5c31c5cea 100644 --- a/konqueror/listview/konq_listview.kcfg +++ b/konqueror/listview/konq_listview.kcfg @@ -7,7 +7,6 @@ <kcfgfile name="konquerorrc"> <parameter name="Protocol" /> </kcfgfile> - <group name="ListView_$(Protocol)"> <entry key="SortBy" type="String"> <default>FileName</default> @@ -19,6 +18,36 @@ <label>Sort Order</label> <whatsthis></whatsthis> </entry> + <entry key="PrimarySortCol" type="String"> + <default>TBD</default> + <label>Primary sort column name</label> + <whatsthis></whatsthis> + </entry> + <entry key="PrimarySortIndex" type="Int"> + <default>-1</default> + <label>Primary sort column offset</label> + <whatsthis></whatsthis> + </entry> + <entry key="PrimarySortOrder" type="Bool"> + <default>true</default> + <label>Primary sort column sorting order</label> + <whatsthis></whatsthis> + </entry> + <entry key="AlternateSortCol" type="String"> + <default>TBD</default> + <label>Alternate sort column name</label> + <whatsthis></whatsthis> + </entry> + <entry key="AlternateSortIndex" type="Int"> + <default>-1</default> + <label>Alternate sort column offset</label> + <whatsthis></whatsthis> + </entry> + <entry key="AlternateSortOrder" type="Bool"> + <default>true</default> + <label>Alternate sort column sorting order</label> + <whatsthis></whatsthis> + </entry> <entry key="FileNameColumnWidth" type="Int"> <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default> <label>Width of the FileName Column</label> @@ -33,5 +62,4 @@ <whatsthis></whatsthis> </entry> </group> - </kcfg>
\ No newline at end of file diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cpp index 45ff99c1c..3910095f9 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cpp @@ -19,6 +19,7 @@ #include "konq_listview.h" #include <konq_settings.h> +#include "konq_string_compare.h" #include <kdebug.h> #include <tdelocale.h> #include <assert.h> @@ -84,10 +85,18 @@ void KonqListViewItem::updateContents() // Set the text of each column setText( 0, m_fileitem->text() ); - // The order is: .dir (0), dir (1), .file (2), file (3) - sortChar = S_ISDIR( m_fileitem->mode() ) ? 1 : 3; - if ( m_fileitem->text()[0] == '.' ) - --sortChar; + bool m_groupDirectoriesFirst = m_pListViewWidget->props()->isDirsFirst(); + bool m_groupHiddenFirst = m_pListViewWidget->props()->isHiddenFirst(); + + // The default TDE order is: .dir (0), dir (1), .file (2), file (3) + + if ( m_groupDirectoriesFirst ) + sortChar = S_ISDIR( m_fileitem->mode() ) ? 1 : 3; + else + sortChar = 3; + + if ( m_groupHiddenFirst && m_fileitem->text()[0] == '.' ) + --sortChar; //now we have the first column, so let's do the rest @@ -152,7 +161,7 @@ void KonqListViewItem::updateContents() const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); if ( tmpColumn->type == TQVariant::DateTime ) { - TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate )); + TQDateTime dt = TQDateTime::fromString( entryStr, TQt::ISODate ); setText(tmpColumn->displayInColumn, TDEGlobal::locale()->formatDateTime(dt)); } @@ -283,9 +292,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending { if ( cInfo->type & TQVariant::DateTime ) { const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); - TQDateTime dt1 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr1, Qt::ISODate )); + TQDateTime dt1 = TQDateTime::fromString( entryStr1, TQt::ISODate ); const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra ); - TQDateTime dt2 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr2, Qt::ISODate )); + TQDateTime dt2 = TQDateTime::fromString( entryStr2, TQt::ISODate ); return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0; } } @@ -295,11 +304,10 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending break; } } - if ( m_pListViewWidget->caseInsensitiveSort() ) - return text( col ).lower().localeAwareCompare( k->text( col ).lower() ); - else { - return m_pListViewWidget->m_pSettings->caseSensitiveCompare( text( col ), k->text( col ) ); - } + + /* If we reach here, we are comparing text columns (e.g file name). */ + + return stringCompare( m_pListViewWidget->m_sortOrder, text( col ), k->text( col ) ); } void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) @@ -314,7 +322,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); TDEListView *lv = static_cast< TDEListView* >( listView() ); - const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cpp index 4c1198325..a41cf6367 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -100,6 +100,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * ,m_bAscending(true) ,m_itemFound(false) ,m_restored(false) + ,m_sortOrder(0) ,m_filenameColumn(0) ,m_itemToGoTo("") ,m_backgroundTimer(0) @@ -120,61 +121,61 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * initConfig(); #if 0 - connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); + connect( this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); #endif - connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )), - this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), - this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); - connect( this, TQT_SIGNAL(executed( TQListViewItem * )), - this, TQT_SLOT(slotExecuted( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )), - this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), - this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), - this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); - connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )), - this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) ); - connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )), - this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) ); - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); - - connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )), - this, TQT_SIGNAL(viewportAdjusted()) ); - connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )), - this, TQT_SIGNAL(viewportAdjusted()) ); + connect( this, TQ_SIGNAL(returnPressed( TQListViewItem * )), + this, TQ_SLOT(slotReturnPressed( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), + this, TQ_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(executed( TQListViewItem * )), + this, TQ_SLOT(slotExecuted( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(currentChanged( TQListViewItem * )), + this, TQ_SLOT(slotCurrentChanged( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), + this, TQ_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), + this, TQ_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(renameNext( TQListViewItem *, int )), + this, TQ_SLOT(slotRenameNextItem( TQListViewItem*, int)) ); + connect( this, TQ_SIGNAL(renamePrev( TQListViewItem *, int )), + this, TQ_SLOT(slotRenamePrevItem( TQListViewItem*, int)) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); + + connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged( int )), + this, TQ_SIGNAL(viewportAdjusted()) ); + connect( verticalScrollBar(), TQ_SIGNAL(valueChanged( int )), + this, TQ_SIGNAL(viewportAdjusted()) ); // Connect the directory lister - connect( m_dirLister, TQT_SIGNAL(started( const KURL & )), - this, TQT_SLOT(slotStarted()) ); - connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) ); - connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); - connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) ); - connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ), - this, TQT_SLOT(slotNewItems( const KFileItemList & )) ); - connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )), - this, TQT_SLOT(slotDeleteItem( KFileItem * )) ); - connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) ); - connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )), - this, TQT_SLOT(slotRedirection( const KURL & )) ); - connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )), - m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); - - connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )), - m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) ); - connect( m_dirLister, TQT_SIGNAL(percent( int )), - m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) ); - connect( m_dirLister, TQT_SIGNAL(speed( int )), - m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) ); - - connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) ); + connect( m_dirLister, TQ_SIGNAL(started( const KURL & )), + this, TQ_SLOT(slotStarted()) ); + connect( m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()) ); + connect( m_dirLister, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) ); + connect( m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear()) ); + connect( m_dirLister, TQ_SIGNAL(newItems( const KFileItemList & ) ), + this, TQ_SLOT(slotNewItems( const KFileItemList & )) ); + connect( m_dirLister, TQ_SIGNAL(deleteItem( KFileItem * )), + this, TQ_SLOT(slotDeleteItem( KFileItem * )) ); + connect( m_dirLister, TQ_SIGNAL(refreshItems( const KFileItemList & )), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & )) ); + connect( m_dirLister, TQ_SIGNAL(redirection( const KURL & )), + this, TQ_SLOT(slotRedirection( const KURL & )) ); + connect( m_dirLister, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )), + m_pBrowserView, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); + + connect( m_dirLister, TQ_SIGNAL(infoMessage( const TQString& )), + m_pBrowserView->extension(), TQ_SIGNAL(infoMessage( const TQString& )) ); + connect( m_dirLister, TQ_SIGNAL(percent( int )), + m_pBrowserView->extension(), TQ_SIGNAL(loadingProgress( int )) ); + connect( m_dirLister, TQ_SIGNAL(speed( int )), + m_pBrowserView->extension(), TQ_SIGNAL(speedProgress( int )) ); + + connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), TQ_SLOT(slotUpdateBackground()) ); viewport()->setMouseTracking( true ); - viewport()->setFocusPolicy( TQ_WheelFocus ); - setFocusPolicy( TQ_WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); setAcceptDrops( true ); //looks better with the statusbar @@ -236,9 +237,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) lstColumns << column; const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting TQVariant::Type t = TQVariant::Invalid; - if ( type.lower() == TQString(TQSTRING_OBJECT_NAME_STRING).lower() ) + if ( type.lower() == TQString("TQString").lower() ) t = TQVariant::String; - else if ( type.lower() == TQString(TQDATETIME_OBJECT_NAME_STRING).lower() ) + else if ( type.lower() == TQString("TQDateTime").lower() ) t = TQVariant::DateTime; else kdWarning() << "Unsupported ExtraType '" << type << "'" << endl; @@ -425,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) { TDEListView::contentsMousePressEvent( e ); } else { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { m_rubber = new TQRect( e->x(), e->y(), 0, 0 ); clearSelection(); emit selectionChanged(); m_fileTip->setItem( 0 ); } - if ( e->button() != Qt::RightButton ) { + if ( e->button() != TQt::RightButton ) { TQListView::contentsMousePressEvent( e ); } } @@ -452,7 +453,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) { } if ( m_scrollTimer ) { - disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -524,28 +525,37 @@ void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) void KonqBaseListViewWidget::contentsMouseDoubleClickEvent(TQMouseEvent *e) { - if (m_rubber) { - TQRect r(m_rubber->normalize()); - delete m_rubber; - m_rubber = NULL; - repaintContents(r, false); - } - - TQPoint vp = contentsToViewport(e->pos()); - KonqBaseListViewItem* item = isExecuteArea(vp) ? - static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL; + if (m_rubber) + { + TQRect r(m_rubber->normalize()); + delete m_rubber; + m_rubber = NULL; + repaintContents(r, false); + } + + TQPoint vp = contentsToViewport(e->pos()); + KonqBaseListViewItem* item = isExecuteArea(vp) ? + static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL; - if (item) { + if (item) + { TDEListView::contentsMouseDoubleClickEvent(e); - } - else { + } + else if (m_pSettings->doubleClickMoveToParent()) + { KParts::URLArgs args; args.trustedSource = true; - KURL upURL = m_dirLister->url().upURL(); - if (!upURL.isEmpty()) { - m_pBrowserView->extension()->openURLRequest(upURL, args); - } - } + KURL baseURL(m_dirLister->url().internalReferenceURL()); + if (baseURL.isEmpty()) + { + baseURL = m_dirLister->url(); + } + KURL upURL = baseURL.upURL(); + if (!upURL.isEmpty()) + { + m_pBrowserView->extension()->openURLRequest(upURL, args); + } + } } void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) @@ -575,7 +585,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p ) TQPoint pt( m_rubber->x(), m_rubber->y() ); pt = contentsToViewport( pt ); - style().tqdrawPrimitive( TQStyle::PE_RubberBand, p, + style().drawPrimitive( TQStyle::PE_RubberBand, p, TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } @@ -752,15 +762,15 @@ void KonqBaseListViewWidget::slotAutoScroll() { m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoScroll() ) ); + connect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->start( 100, false ); } } else if ( m_scrollTimer ) { - disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -962,7 +972,7 @@ void KonqBaseListViewWidget::slotSelectionChanged() void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ) { - if ( _button == Qt::MidButton ) + if ( _button == TQt::MidButton ) { if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) ) m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() ); @@ -1206,11 +1216,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url ) { m_pBrowserView->newIconSize( m_pBrowserView->m_pProps->iconSize() ); m_pBrowserView->m_paShowDot->setChecked( m_pBrowserView->m_pProps->isShowingDotFiles() ); - if ( m_pBrowserView->m_paCaseInsensitive->isChecked() != m_pBrowserView->m_pProps->isCaseInsensitiveSort() ) { - m_pBrowserView->m_paCaseInsensitive->setChecked( m_pBrowserView->m_pProps->isCaseInsensitiveSort() ); - // This is in case openURL returned all items synchronously. - sort(); - } + m_sortOrder = m_pBrowserView->m_pProps->getSortOrder(); // It has to be "viewport()" - this is what KonqDirPart's slots act upon, // and otherwise we get a color/pixmap in the square between the scrollbars. @@ -1484,7 +1490,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r ) { - const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = viewport()->paletteBackgroundPixmap(); if (!pm || pm->isNull()) p->fillRect(r, viewport()->backgroundColor()); @@ -1557,7 +1563,7 @@ void KonqBaseListViewWidget::slotUpdateBackground() if ( !m_backgroundTimer ) { m_backgroundTimer = new TQTimer( this ); - connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) ); + connect( m_backgroundTimer, TQ_SIGNAL( timeout() ), viewport(), TQ_SLOT( update() ) ); } else m_backgroundTimer->stop(); @@ -1566,11 +1572,6 @@ void KonqBaseListViewWidget::slotUpdateBackground() } } -bool KonqBaseListViewWidget::caseInsensitiveSort() const -{ - return m_pBrowserView->m_pProps->isCaseInsensitiveSort(); -} - // based on isExecuteArea from tdelistview.cpp int KonqBaseListViewWidget::executeArea( TQListViewItem *_item ) { diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index 613f012b3..ebae4c389 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -79,7 +79,7 @@ class KonqBaseListViewWidget : public TDEListView friend class KonqListView; friend class ListViewBrowserExtension; - Q_OBJECT + TQ_OBJECT public: KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget ); @@ -137,7 +137,6 @@ public: void setAscending( bool b ) { m_bAscending = b; } bool ascending() const { return m_bAscending; } - bool caseInsensitiveSort() const; virtual void paintEmptyArea( TQPainter *p, const TQRect &r ); @@ -260,6 +259,8 @@ protected: bool m_itemFound:1; bool m_restored:1; + TextSortOrder m_sortOrder; + int m_filenameColumn; int m_filenameColumnWidth; diff --git a/konqueror/listview/konq_textview.desktop b/konqueror/listview/konq_textview.desktop index 3f44f0543..ff4e4c988 100644 --- a/konqueror/listview/konq_textview.desktop +++ b/konqueror/listview/konq_textview.desktop @@ -1,85 +1,6 @@ [Desktop Entry] Type=Service Name=Text View -Name[af]=Teks Besigtig -Name[ar]=عرض نصي -Name[az]=Mətn Görünüşü -Name[be]=Тэкст -Name[bg]=Текстов преглед -Name[bn]=টেক্সট ভিউ -Name[br]=Gwel skrid -Name[bs]=Tekstualni pogled -Name[ca]=Vista de text -Name[cs]=Textový pohled -Name[csb]=Tekstowi wëzdrzatk -Name[cy]=Golwg Testun -Name[da]=Tekstvisning -Name[de]=Textansicht -Name[el]=Προβολή κειμένου -Name[eo]=Tekstrigardo -Name[es]=Vista de texto -Name[et]=Vaade tekstina -Name[eu]=Testu ikuspegia -Name[fa]=متننما -Name[fi]=Tekstinäkymä -Name[fr]=Affichage de Texte -Name[fy]=Tekstwerjefte -Name[ga]=Amharc Téacs -Name[gl]=Vista de Texto -Name[he]=תצוגת טקסט -Name[hi]=पाठ दृश्य -Name[hr]=Tekstualni prikaz -Name[hu]=Szöveges -Name[id]=Tampilan Teks -Name[is]=Textasýn -Name[it]=Vista testuale -Name[ja]=テキストビュー -Name[ka]=ტექსტის სახით -Name[kk]=Жай мәтін тізім -Name[km]=ទិដ្ឋភាពអត្ថបទ -Name[ko]=VideoText 뷰어 -Name[lo]=ມຸມມອງຂໍ້ຄວາມ -Name[lt]=Rodyti tekstą -Name[lv]=Teksta Skatījums -Name[mk]=Текстуален преглед -Name[mn]=Текстээр харах -Name[ms]=Paparan Teks -Name[mt]=Uri Kliem biss -Name[nb]=Tekstvisning -Name[nds]=Textansicht -Name[ne]=पाठ दृश्य -Name[nl]=Tekstweergave -Name[nn]=Tekstvising -Name[nso]=Pono ya Sengwalwana -Name[pa]=ਪਾਠ ਝਲਕ -Name[pl]=Widok tekstowy -Name[pt]=Vista em Texto -Name[pt_BR]=Visão Texto -Name[ro]=Vizualizare text -Name[ru]=В виде текста -Name[rw]=Igaragaza Umwandiko -Name[se]=Teakstačájeheapmi -Name[sk]=Textový pohľad -Name[sl]=Besedilni pogled -Name[sr]=Текстуални приказ -Name[sr@Latn]=Tekstualni prikaz -Name[sv]=Textvy -Name[ta]=உரை காட்சி -Name[te]=వచన వీక్షణం -Name[tg]=Ба намуди матн -Name[th]=มุมมองแบบข้อความ -Name[tr]=Metin Görünümü -Name[tt]=Mätenle Küreneş -Name[uk]=Текстовий вигляд -Name[uz]=Matn koʻrinishida -Name[uz@cyrillic]=Матн кўринишида -Name[ven]=Mbonalelo ya Manwalwa -Name[vi]=Xem kiểu Văn bản -Name[wa]=Vey e môde tecse -Name[xh]=Imboniselo Yombhalo -Name[zh_CN]=文本视图 -Name[zh_TW]=文字檢視 -Name[zu]=Umbukiso wombhalo MimeType=inode/directory X-TDE-ServiceTypes=Browser/View X-TDE-Library=konq_listview diff --git a/konqueror/listview/konq_textview.rc b/konqueror/listview/konq_textview.rc index 612deb5cb..e29a0293b 100644 --- a/konqueror/listview/konq_textview.rc +++ b/konqueror/listview/konq_textview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KonqTextView" version="5"> +<kpartgui name="KonqTextView" version="7"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Menu name="selection"><text>Selection</text> @@ -13,7 +13,17 @@ </Menu> <Menu name="view"><text>&View</text> <Action name="show_dot" /> - <Action name="sort_caseinsensitive"/> + <Menu name="sort"><text>&Sort</text> + <Action name="order_unicode_based"/> + <Action name="order_unicode_based_case_insensitive"/> + <Action name="order_locale_based"/> + <Separator/> + <Action name="group_directories_first"/> + <Action name="group_hidden_first"/> + <Separator/> + <Action name="alternate_sort_order"/> + <Action name="reverse_sort_order"/> + </Menu> <Menu name="listview_show"><text>Show Details</text> <TearOffHandle /> <Action name="show_size"/> diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cpp index 1076e10af..625e10f79 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cpp @@ -210,7 +210,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]); // Don't do that! Keep things readable whatever the selection background color is // cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]); -// cg.setColor(TQColorGroup::Highlight, Qt::darkGray); +// cg.setColor(TQColorGroup::Highlight, TQt::darkGray); TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } @@ -223,7 +223,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, TQPixmap pix( _r.width(), _r.height() ); bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() ); TQImage im = pix.convertToImage(); - im = KImageEffect::fade( im, 0.25, Qt::black ); + im = KImageEffect::fade( im, 0.25, TQt::black ); _p->drawImage( _r.topLeft(), im ); }*/ diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cpp index ab227899a..d814d2fbc 100644 --- a/konqueror/listview/konq_textviewwidget.cc +++ b/konqueror/listview/konq_textviewwidget.cpp @@ -43,17 +43,17 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi setAllColumnsShowFocus(TRUE); setRootIsDecorated(false); - colors[KTVI_REGULAR]=Qt::black; + colors[KTVI_REGULAR]=TQt::black; colors[KTVI_EXEC]=TQColor(0,170,0); - colors[KTVI_REGULARLINK]=Qt::black; - colors[KTVI_DIR]=Qt::black; - colors[KTVI_DIRLINK]=Qt::black; - colors[KTVI_BADLINK]=Qt::red; - colors[KTVI_SOCKET]=Qt::magenta; - colors[KTVI_FIFO]=Qt::magenta; - colors[KTVI_UNKNOWN]=Qt::red; - colors[KTVI_CHARDEV]=Qt::blue; - colors[KTVI_BLOCKDEV]=Qt::blue; + colors[KTVI_REGULARLINK]=TQt::black; + colors[KTVI_DIR]=TQt::black; + colors[KTVI_DIRLINK]=TQt::black; + colors[KTVI_BADLINK]=TQt::red; + colors[KTVI_SOCKET]=TQt::magenta; + colors[KTVI_FIFO]=TQt::magenta; + colors[KTVI_UNKNOWN]=TQt::red; + colors[KTVI_CHARDEV]=TQt::blue; + colors[KTVI_BLOCKDEV]=TQt::blue; m_showIcons=FALSE; } diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h index 06a5cbbb5..d42014ba1 100644 --- a/konqueror/listview/konq_textviewwidget.h +++ b/konqueror/listview/konq_textviewwidget.h @@ -32,7 +32,7 @@ class KonqTextViewItem; class KonqTextViewWidget : public KonqBaseListViewWidget { friend class KonqTextViewItem; - Q_OBJECT + TQ_OBJECT public: KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqTextViewWidget(); diff --git a/konqueror/listview/konq_treeview.desktop b/konqueror/listview/konq_treeview.desktop index 3169cba48..7960d145a 100644 --- a/konqueror/listview/konq_treeview.desktop +++ b/konqueror/listview/konq_treeview.desktop @@ -1,84 +1,6 @@ [Desktop Entry] Type=Service Name=Tree View -Name[af]=Boom Besigtig -Name[ar]=عرض شجري -Name[az]=Ağaç Görünüşü -Name[be]=Дрэва -Name[bg]=Дървовиден преглед -Name[bn]=ট্রি ভিউ -Name[br]=Gwel gwezenn -Name[bs]=Pogled stabla -Name[ca]=Vista d'arbre -Name[cs]=Stromový pohled -Name[csb]=Wëzdrzatk drzéwiã -Name[cy]=Golwg Coeden -Name[da]=Trævisning -Name[de]=Baumansicht -Name[el]=Προβολή δέντρου -Name[eo]=Arba rigardo -Name[es]=Vista en árbol -Name[et]=Vaade puuna -Name[eu]=Zuhaitz erako ikuspegia -Name[fa]=درختنما -Name[fi]=Puunäkymä -Name[fr]=Affichage en arborescence -Name[fy]=Beamstruktuerwerjefte -Name[ga]=Amharc Crainn -Name[gl]=Vista de Árbore -Name[he]=תצוגת עץ -Name[hi]=ट्री दृश्य -Name[hr]=Prikaz stabla -Name[hu]=Fastruktúra -Name[id]=Tampilan Pohon -Name[is]=Trjáasýn -Name[it]=Vista ad albero -Name[ja]=ツリービュー -Name[ka]=ხის სახით -Name[kk]=Бұтақ түрінде -Name[km]=ទិដ្ឋភាពមែកធាង -Name[lo]=ມຸມມອງແບບລາຍການຕົ້ນໄມ້ -Name[lt]=Rodyti medį -Name[lv]=Koka Skatījums -Name[mk]=Преглед со стебло -Name[mn]=Модоор харах -Name[ms]=Paparan Pepohon -Name[mt]=Uri Friegħi -Name[nb]=Trevisning -Name[nds]=Boomansicht -Name[ne]=ट्रि दृश्य -Name[nl]=Boomstructuurweergave -Name[nn]=Trevising -Name[nso]=Pono ya Mohlare -Name[pa]=ਲੜੀ ਝਲਕ -Name[pl]=Widok drzewa -Name[pt]=Vista em Árvore -Name[pt_BR]=Visão em Árvore -Name[ro]=Vizualizare arborescentă -Name[ru]=В виде дерева -Name[rw]=Igaragaza Igiti -Name[se]=Muorračájeheapmi -Name[sk]=Stromová štruktúra -Name[sl]=Drevesni pogled -Name[sr]=Приказ стабла -Name[sr@Latn]=Prikaz stabla -Name[sv]=Trädvy -Name[ta]=மரக் காட்சி -Name[te]=ట్రీ వీక్షణం -Name[tg]=Ба намуди дарахт -Name[th]=มุมมองแบบรายการต้นไม้ -Name[tr]=Ağaç Görünümü -Name[tt]=Ağaçlı Küreneş -Name[uk]=Вигляд структури каталогів -Name[uz]=Daraxt koʻrinishida -Name[uz@cyrillic]=Дарахт кўринишида -Name[ven]=Mbonalelo ya Muri -Name[vi]=Xem kiểu Cây -Name[wa]=Vey come èn åbe -Name[xh]=Imboniselo Yomthi -Name[zh_CN]=树视图 -Name[zh_TW]=樹狀瀏覽 -Name[zu]=Umbukiso Wesihlahla MimeType=inode/directory X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=konq_listview diff --git a/konqueror/listview/konq_treeview.rc b/konqueror/listview/konq_treeview.rc index 7f8981779..9ef045785 100644 --- a/konqueror/listview/konq_treeview.rc +++ b/konqueror/listview/konq_treeview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KonqTreeView" version="10"> +<kpartgui name="KonqTreeView" version="12"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Menu name="selection"><text>Selection</text> @@ -24,8 +24,17 @@ </Menu> <Separator/> <Action name="show_dot"/> - <Action name="sort_caseinsensitive"/> - <!--<Action name="sort_directoriesfirst" /> TODO --> + <Menu name="sort"><text>&Sort</text> + <Action name="order_unicode_based"/> + <Action name="order_unicode_based_case_insensitive"/> + <Action name="order_locale_based"/> + <Separator/> + <Action name="group_directories_first"/> + <Action name="group_hidden_first"/> + <Separator/> + <Action name="alternate_sort_order"/> + <Action name="reverse_sort_order"/> + </Menu> <Menu name="listview_show"><text>Show Details</text> <TearOffHandle /> <Action name="show_size"/> diff --git a/konqueror/listview/konq_treeviewitem.cc b/konqueror/listview/konq_treeviewitem.cpp index 12953c401..12953c401 100644 --- a/konqueror/listview/konq_treeviewitem.cc +++ b/konqueror/listview/konq_treeviewitem.cpp diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cpp index 77adc4b61..02c297c88 100644 --- a/konqueror/listview/konq_treeviewwidget.cc +++ b/konqueror/listview/konq_treeviewwidget.cpp @@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWi setRootIsDecorated( true ); setTreeStepSize( 20 ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotCompleted( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( clear( const KURL & ) ), - this, TQT_SLOT( slotClear( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotCompleted( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( clear( const KURL & ) ), + this, TQ_SLOT( slotClear( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } KonqTreeViewWidget::~KonqTreeViewWidget() diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h index 01b85ddf6..0f16240db 100644 --- a/konqueror/listview/konq_treeviewwidget.h +++ b/konqueror/listview/konq_treeviewwidget.h @@ -32,7 +32,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget { friend class KonqListViewDir; - Q_OBJECT + TQ_OBJECT public: KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget ); virtual ~KonqTreeViewWidget(); diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt index 29ebd5661..f5610a0ae 100644 --- a/konqueror/preloader/CMakeLists.txt +++ b/konqueror/preloader/CMakeLists.txt @@ -24,8 +24,17 @@ link_directories( ##### other data ################################ -install( FILES konqy_preloader.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install( FILES konqy_preload.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE konqy_preloader.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/kded + PO_DIR konqueror-desktops +) + +tde_create_translated_desktop( + SOURCE konqy_preload.desktop + DESTINATION ${AUTOSTART_INSTALL_DIR} + PO_DIR konqueror-desktops +) ##### kded_konqy_preloader (module) ############# @@ -33,7 +42,7 @@ install( FILES konqy_preload.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) set( target kded_konqy_preloader ) set( ${target}_SRCS - preloader.cc preloader.skel + preloader.cpp preloader.skel ) tde_add_kpart( ${target} AUTOMOC diff --git a/konqueror/preloader/Makefile.am b/konqueror/preloader/Makefile.am index ff2440b0d..9c446faa8 100644 --- a/konqueror/preloader/Makefile.am +++ b/konqueror/preloader/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = -DTQT_NO_CAST_ASCII kde_module_LTLIBRARIES = kded_konqy_preloader.la INCLUDES= -I.. $(all_includes) -kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel +kded_konqy_preloader_la_SOURCES = preloader.cpp preloader.skel kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_TDESYCOCA) $(LIB_TDECORE) diff --git a/konqueror/preloader/configure.in.in b/konqueror/preloader/configure.in.in index 315b23c97..a581917cb 100644 --- a/konqueror/preloader/configure.in.in +++ b/konqueror/preloader/configure.in.in @@ -1,5 +1,5 @@ dnl check whether mallinfo() is available and which fields to use to find out memory usage -dnl it's used in konq_mainwindow.cc +dnl it's used in konq_mainwindow.cpp dnl warning, ugly code ahead dnl some implementations have mallinfo() in stdlib.h, others in malloc.h dnl fields showing memory usage should be hblkhd, uordblks and usmblks, diff --git a/konqueror/preloader/konqy_preload.desktop b/konqueror/preloader/konqy_preload.desktop index 8bae334cb..63ea489ae 100644 --- a/konqueror/preloader/konqy_preload.desktop +++ b/konqueror/preloader/konqy_preload.desktop @@ -2,73 +2,6 @@ Exec=konqueror --preload Type=Application Name=Konqueror Preloading During TDE startup -Name[af]=Vroegtydige laai van Konqueror tydens TDE opstart -Name[ar]=تحميل Konqueror التمهيدي خلال بدء تشغيل TDE -Name[az]=TDE Başlanğıcında Konqueror-un Ön Yüklənməsi -Name[be]=Папярэдняя загрузка Konqueror падчас запуску TDE -Name[bg]=Зареждане на браузъра при стартиране -Name[bn]=কে.ডি.ই. আরম্ভকালীন কনকরার প্রিলোড -Name[bs]=Konqueror pre-učitavanje tokom pokretanja TDEa -Name[ca]=Precàrrega del Konqueror durant l'engegada del TDE -Name[cs]=Načtení Konqueroru dopředu během spuštění TDE -Name[csb]=Wstãpny wladënk Konquerora przë zrëszaniu TDE -Name[cy]=Cynlwytho Konqueror yn ystod Ymgychwyn TDE -Name[da]=Konqueror forhåndsindlæsning ved opstart -Name[de]=Konqueror bei TDE-Start im Hintergrund laden -Name[el]=Προφόρτωση του Konqueror κατά την εκκίνηση του TDE -Name[eo]=Konkeranto antaŭŝarĝante dum TDE-lanĉo -Name[es]=Precargado de Konqueror durante el arranque de TDE -Name[et]=Konquerori eellaadimine TDE käivitamisel -Name[eu]=Konquerorren aurrekarga TDE abiatzen den bitartean -Name[fa]=پیشبارگذاری Konqueror در طول راهاندازی TDE -Name[fi]=Konquerorin esilataus TDE:n käynnistyksessä -Name[fr]=Préchargement de Konqueror lors du démarrage de TDE -Name[fy]=Konqueror foarlade ûnder it begjinnen fan TDE -Name[ga]=Réamhluchtú Konqueror ag am tosaithe TDE -Name[gl]=Precarga de Konqueror durante o início de TDE -Name[he]=טעינה מוקדמת של Konqueror בזמן עלית TDE -Name[hi]=केडीई चालू होने के दौरान कॉन्करर प्रीलोड हो रहा है -Name[hr]=Konqueror pred-učitavanje tijekom podizanja TDE-a -Name[hu]=Konqueror-gyorsbetöltő -Name[is]=Konqueror ræsir þegar TDE ræsir -Name[it]=Precaricamento di Konqueror durante l'avvio di TDE -Name[ja]=TDE 起動時に Konqueror をプリロードします -Name[ka]=Konqueror-ის წინჩატვირთვა TDE-ს გაშვებისას -Name[kk]=TDE бастағанда Konqueror-ді алдын-ала жүктеу -Name[km]=ប្រុងប្រៀបផ្ទុក Konqueror កំឡុងពេលចាប់ផ្ដើម TDE -Name[ko]=TDE 시작 중 Konqueror 미리 불러오기 -Name[lt]=Įkelti Konqueror paleidžiant TDE -Name[lv]=Iekarotāja priekšielāde TDE palaišanās laikā -Name[mk]=Konqueror се предвчитува за време на подигањето на TDE -Name[ms]=Prapemuatan Konqueror Semasa pemulaan TDE -Name[mt]=Tlugħ ta' Konqueror waqt li jitla' TDE -Name[nb]=Forhåndslast Konqueror når TDE starter -Name[nds]=Konqueror vörladen bi't Hoochfohren vun TDE -Name[ne]=TDE सुरुआत गर्दा पहिले लोड गरिएको कन्क्वेरर -Name[nl]=Konqueror voorladen tijdens TDE-start -Name[nn]=Førehandslast Konqueror når TDE startar -Name[pa]=ਕੋਨਕਿਉਰੋਰ ਪਹਿਲਾਂ ਹੀ TDE ਦੀ ਸ਼ੁਰੂਆਤ 'ਤੇ ਹੀ ਲੋਡ ਹੋ ਜਾਦਾ ਹੈ -Name[pl]=Wstępne wczytanie Konquerora przy uruchamianiu TDE -Name[pt]=Pré-Carregamento do Konqueror no Arranque do TDE -Name[pt_BR]=Pré-carregamento do Konqueror no início do TDE -Name[ro]=Preîncărcare Konqueror la pornirea TDE -Name[ru]=Предварительная загрузка Konqueror при запуске TDE -Name[rw]=Ugutangirambere kwa Konqueror mu gihe cy'itangira rya TDE -Name[se]=Viečča Konquerora ovdagihtii go TDE vuolgá johtui -Name[sk]=Prednahratie Konquerora počas štartu TDE -Name[sl]=Prednalaganje Konquerorja med zaganjanjem TDE -Name[sr]=Предучитавање Konqueror-а приликом покретања TDE-а -Name[sr@Latn]=Predučitavanje Konqueror-a prilikom pokretanja TDE-a -Name[sv]=Förladdning av Konqueror vid start av TDE -Name[ta]=கேடியி துவக்கத்தின்போது கான்கொரரை முன் ஏற்றுதல் -Name[th]=ให้โหลดคอนเควอร์เรอร์ล่วงหน้า ขณะ TDE เริ่มทำงานริ่มทำงาน -Name[tr]=TDE açılışında Konqueror Önyüklemesi -Name[tt]=Konqueror'nı Aldan uq Yökläw -Name[uk]=Попереднє завантаження Konqueror при старті TDE -Name[vi]=Tải sẵn Konqueror Trong lúc Khởi động TDE -Name[wa]=Prétcherdjî Konqueror tins l' enondaedje di TDE -Name[zh_CN]=在 TDE 启动时预先装入 Konqueror -Name[zh_TW]=啟動 TDE 時預先載入 Konqueror X-TDE-autostart-condition=konquerorrc:Reusing:PreloadOnStartup:false X-TDE-StartupNotify=false X-TDE-autostart-phase=2 diff --git a/konqueror/preloader/konqy_preloader.desktop b/konqueror/preloader/konqy_preloader.desktop index e23ebc7f4..bb9e37f6f 100644 --- a/konqueror/preloader/konqy_preloader.desktop +++ b/konqueror/preloader/konqy_preloader.desktop @@ -1,143 +1,10 @@ [Desktop Entry] Type=Service + Name=KDED Konqueror Preloader Module -Name[af]=KDED Konqueror Vroegtydige Laai Module -Name[ar]=وحدة تمهيد التحميل لِــ KDED Konqueror -Name[az]=KDED Konqueror Ön Yüklənmə Modulu -Name[be]=Модуль папярэдняй загрузкі Konqueror KDED -Name[bn]=KDED কনকরার প্রি-লোডার মডিউল -Name[bs]=KDED modul za pre-učitavanje Konquerora -Name[ca]=Mòdul de precàrrega del Konqueror KDED -Name[cs]=KDED modul pro načítání Konqueroru -Name[csb]=Mòduł wstãpnegò wladënkù Konquerora -Name[cy]=Modiwl Cynlwytho Konqueror KDED -Name[da]=KDED Konqueror forindlæsningsmodul -Name[de]=Konqueror-Schnellstart -Name[el]=KDED άρθρωμα Προφόρτωσης του Konqueror -Name[eo]=KDED-Konkeranta antaŭŝarĝomodulo -Name[es]=Módulo de precarga de Konqueror KDED -Name[et]=KDED Konquerori eellaadimise moodul -Name[eu]=KDED Konqueror aurrekargatze modulua -Name[fa]=پیمانۀ پیشبارکنندۀ KDED Konqueror -Name[fi]=Konquerorin esilatausmoduuli KDED:lle -Name[fr]=Module KDED de préchargement de Konqueror -Name[fy]=KDED Konqueror Foarlaad-module -Name[ga]=Modúl Réamhluchtú Konqueror KDED -Name[gl]=Módulo KDED de Precarga de Konqueror -Name[he]=מודול KDED Konqueror Preloader -Name[hi]=केडीईडी कॉन्क्वेरर प्रीलोडर मॉड्यूल -Name[hr]=KDED Konqueror modul pred-učitavanja -Name[hu]=KDED gyorsbetöltő modul a Konquerorhoz -Name[is]=KDED Konqueror forræsingareining -Name[it]=Modulo di KDED per precaricare Konqueror -Name[ja]=KDED Konqueror プリロードモジュール -Name[ka]=Konqueror-ის წინჩატვირთვის მოდული KDED -Name[kk]=KDED деген Konqueror-ді алдын-ала жүктеу модулі -Name[km]=ម៉ូឌុលកម្មវិធីប្រុងប្រៀបផ្ទុក KDED Konqueror -Name[ko]=KDED Konqueror 프리로더 모듈 -Name[lt]=KDED Konqueror išankstinio įkrovimo modulis -Name[lv]=KDED Iekarotāja priekšielādēšanas modulis -Name[mk]=Модул на KDED за предвчитување на Konqueror -Name[ms]=Modul Pramuat Konqueror KDED -Name[mt]=Modulu biex itella' Konqueror fil-bidu -Name[nb]=KDED-modul for å forhåndslaste Konqueror -Name[nds]=KDED-Moduul för't Vörladen vun Konqueror -Name[ne]=KDED कन्क्वेरर प्रीलोडर मेनु -Name[nl]=KDED Konqueror Preloader-module -Name[nn]=KDED-modul for førehandslasting av Konqueror -Name[pa]=KDED ਕੋਨਕਿਉਰੋਰ ਪਹਿਲਾਂ ਲੋਡ ਮੇਡੀਊਲ -Name[pl]=Moduł KDED wstępnego wczytania Konquerora -Name[pt]=Módulo KDED de Pré-Carregamento do Konqueror -Name[pt_BR]=Módulo de Pré-carregamento do Konqueror -Name[ro]=Modul KDED de preîncărcare Konqueror -Name[ru]=Предварительная загрузка Konqueror -Name[rw]=Igice Mutangizambere KDED Konqueror -Name[sk]=Modul KDED prednahrania Konquerora -Name[sl]=Modul KDED za prednalaganje Konquerorja -Name[sr]=Модул за предучитавање Konqueror-а, KDED -Name[sr@Latn]=Modul za predučitavanje Konqueror-a, KDED -Name[sv]=KDED Konqueror-förladdningsmodul -Name[ta]=KDED கான்கொரர் முன் ஏற்றக்கூடிய பகுதி -Name[th]=โมดูลโหลดคอนเควอร์เรอร์ล่วงหน้าของ KDED -Name[tr]=KDED Konqueror Önyükleme Modülü -Name[tt]=Konqueror'nı Aldan uq Yökläw -Name[uk]=Модуль KDED для попереднього завантаження Konqueror -Name[vi]=Mô đun Tải sẵn Konqueror KDED -Name[wa]=Module KDED di prétcherdjaedje di Konqueror -Name[zh_CN]=KDED Konqueror 预装入模块 -Name[zh_TW]=KDED Konqueror 預先載入模組 + Comment=Reduces Konqueror startup time -Comment[af]=Verminder Konqueror se opstart tyd -Comment[ar]=Konqueror يقلّل من وقت بدء تشغيل -Comment[az]=Konqueror-un başlanğıc sürəsini azaldır -Comment[be]=Змяншае час запуску Konqueror -Comment[bg]=Намаляване на времето за стартиране на браузъра -Comment[bn]=কনকরার চালু করার সময় কমায় -Comment[bs]=Skraćuje vrijeme za pokretanje Konquerora -Comment[ca]=Redueix el temps d'inici del Konqueror -Comment[cs]=Redukuje čas pro spuštění Konqueroru -Comment[csb]=Zmiészô czas zrëszaniô Konquerora -Comment[cy]=Lleihau amser ymgychwyn Konqueror -Comment[da]=Reducerer Konquerors opstartstid -Comment[de]=Lädt Konqueror im Voraus und verringert so die Ladezeit -Comment[el]=Μειώνει το χρόνο εκκίνησης του Konqueror -Comment[eo]=Mallongigas la Konkerantan starttempon -Comment[es]=Reduce el tiempo de inicio de Konqueror -Comment[et]=Kahandab Konquerori käivitamise aega -Comment[eu]=Konquerorren abiatze denbora laburtzen du -Comment[fa]=زمان راهاندازی Konqueror را کاهش میدهد -Comment[fi]=Vähentää Konquerorin käynnistysaikaa -Comment[fr]=Réduit le temps de démarrage de Konqueror -Comment[fy]=Redusearret de begjintiid fan Konqueror -Comment[ga]=Laghdaíonn sé seo an t-am chun Konqueror a thosú -Comment[gl]=Reduce o tempo de início de Konqueror -Comment[he]=מוריד את זמן הפעלת Konqueror -Comment[hi]=कॉन्करर के चालू होने के समय को कम करता है -Comment[hr]=Ubrzava pokretanje Konquerora -Comment[hu]=A Konqueror elindulási idejének lecsökkentése -Comment[is]=Dregur úr ræsingatíma Konqueror vafrans -Comment[it]=Riduce il tempo di avvio di Konqueror -Comment[ja]=Konqueror の起動時間を短縮します -Comment[ka]=ამცირებს Konqueror-ის გაშვების დროს -Comment[kk]=Konqueror-ді жүктеу уақытын қысқартады -Comment[km]=បន្ថយរយៈពេលចាប់ផ្ដើមរបស់ Konqueror -Comment[ko]=Konqueror 시작 시간을 줄입니다 -Comment[lt]=Sutrumpina Konqueror paleidimo laiką -Comment[lv]=Samazina Iekarotāja palaišanas laiku -Comment[mk]=Го намалува времето за стартување на Konqueror -Comment[mn]=Конкюрорын эхлэх хугацааг багасгах -Comment[ms]=Mengurangkan masa pemulaan Konqueror -Comment[mt]=Inaqqas id-dewmien biex jitla' Konqueror -Comment[nb]=Reduserer oppstartstida for Konqueror -Comment[nds]=Bringt de Starttiet vun Konqueror daal -Comment[ne]=कन्क्वेरर सुरुआत समय घटाउँछ -Comment[nl]=Reduceert de opstarttijd van Konqueror -Comment[nn]=Reduserer oppstartstida til Konqueror -Comment[pa]=ਇਹ ਕੋਨਕਿਉਰੋਰ ਦਾ ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਘਟਾਉਦਾ ਹੈ -Comment[pl]=Zmniejsza czas uruchomienia Konquerora -Comment[pt]=Reduz o tempo de arranque do Konqueror -Comment[pt_BR]=Reduz o tempo de inicialização do Konqueror -Comment[ro]=Reduce timpul de pornire al Konqueror -Comment[ru]=Предварительная загрузка Konqueror во время запуска KDED -Comment[rw]=Igabanya igihe cy'itangira cya Konqueror -Comment[se]=Unnida Konquerora álggahanáiggi -Comment[sk]=Zmenšuje dobu štartu Konquerora -Comment[sl]=Skrajša zagonski čas Konquerorja -Comment[sr]=Смањује време потребно за покретање Konqueror-а -Comment[sr@Latn]=Smanjuje vreme potrebno za pokretanje Konqueror-a -Comment[sv]=Minskar Konquerors starttid -Comment[ta]=கான்கொரர் துவக்க நேரத்தை குறைக்கிறது -Comment[te]=కాంకెరర్ మొదలు సమయాన్ని తగ్గించును -Comment[th]=ลดเวลาที่ใช้เริ่มทำงานของคอนเควอร์เรอร์ -Comment[tr]=Konqueror açılış zamanını azaltır -Comment[tt]=Konqueror cibärüen tizlätä -Comment[uk]=Зменшує час запуску Konqueror -Comment[uz]=Konqueror ishga tushish vaqtini kamaytirish -Comment[uz@cyrillic]=Konqueror ишга тушиш вақтини камайтириш -Comment[vi]=Giảm thời gian khởi động Konqueror -Comment[wa]=Fwait enonder pus raddimint Konqueror -Comment[zh_CN]=减少 Konqueror 启动时间 -Comment[zh_TW]=減少 Konqueror 啟動時間 + X-TDE-ServiceTypes=KDEDModule X-TDE-ModuleType=Library X-TDE-Library=konqy_preloader diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cpp index 5d87a8b07..ecc6691da 100644 --- a/konqueror/preloader/preloader.cc +++ b/konqueror/preloader/preloader.cpp @@ -30,10 +30,10 @@ KonqyPreloader::KonqyPreloader( const TQCString& obj ) : KDEDModule( obj ) { reconfigure(); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& )), - TQT_SLOT( appRemoved( const TQCString& ))); - connect( &check_always_preloaded_timer, TQT_SIGNAL( timeout()), - TQT_SLOT( checkAlwaysPreloaded())); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )), + TQ_SLOT( appRemoved( const TQCString& ))); + connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()), + TQ_SLOT( checkAlwaysPreloaded())); } KonqyPreloader::~KonqyPreloader() diff --git a/konqueror/preloader/preloader.h b/konqueror/preloader/preloader.h index c2767522b..220c0d15f 100644 --- a/konqueror/preloader/preloader.h +++ b/konqueror/preloader/preloader.h @@ -26,7 +26,7 @@ class KonqyPreloader : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: KonqyPreloader( const TQCString& obj ); diff --git a/konqueror/profile_filemanagement.desktop b/konqueror/profile_filemanagement.desktop index 8f4452387..313abef92 100644 --- a/konqueror/profile_filemanagement.desktop +++ b/konqueror/profile_filemanagement.desktop @@ -3,85 +3,6 @@ Container0_Children=View1,View2 Container0_Orientation=Horizontal Container0_SplitterSizes=30,100 Name=File Management -Name[af]=Lêer Bestuurder -Name[ar]=تدبير الملفات -Name[az]=Fayl İdarəcisi -Name[be]=Кіраванне файламі -Name[bn]=ফাইল ব্যবস্থাপনা -Name[br]=Mererezh ar restroù -Name[bs]=Upravljanje datotekama -Name[ca]=Gestió de fitxers -Name[cs]=Správa souborů -Name[csb]=Sprôwianié lopkama -Name[cy]=Trefnu Ffeiliau -Name[da]=Filhåndtering -Name[de]=Dateiverwaltung -Name[el]=Διαχείριση αρχείων -Name[eo]=Dosieradministrilo -Name[es]=Administración de archivos -Name[et]=Failihaldur -Name[eu]=Fitxategi kudeaketa -Name[fa]=مدیریت پرونده -Name[fi]=Tiedostonhallinta -Name[fr]=Gestion de fichiers -Name[fy]=Triembehear -Name[ga]=Bainistiú Comhaid -Name[gl]=Xestión de Ficheiros -Name[he]=ניהול קבצים -Name[hi]=फ़ाइल प्रबंधन -Name[hr]=Upravitelj datotekama -Name[hu]=Fájlkezelő -Name[id]=Manajemen File -Name[is]=Skráastjóri -Name[it]=Gestione file -Name[ja]=ファイルマネージメント -Name[ka]=ფაილთა მართვა -Name[kk]=Файдарды басқару -Name[km]=ការគ្រប់គ្រងឯកសារ -Name[ko]=파일 관리자 -Name[lo]=ການຈັດການແຟ້ມ -Name[lt]=Bylų valdymas -Name[lv]=Failu Menedžments -Name[mk]=Менаџмент на датотеки -Name[mn]=Файлын удирдлага -Name[ms]=Pengurusan Fail -Name[mt]=Maniġġjar tal-Fajls -Name[nb]=Filbehandling -Name[nds]=Dateipleeg -Name[ne]=फाइल व्यवस्थापन -Name[nl]=Bestandsbeheer -Name[nn]=Filhandsaming -Name[nso]=Taolo ya Faele -Name[oc]=Gestion de fiquièrs -Name[pa]=ਫਾਇਲ ਪਰਬੰਧਨ -Name[pl]=Zarządzanie plikami -Name[pt]=Gestão de Ficheiros -Name[pt_BR]=Gerenciamento de arquivos -Name[ro]=Administrare fișiere -Name[ru]=Управление файлами -Name[rw]=Icunga ry'Idosiye -Name[se]=Fiilagieđaheapmi -Name[sk]=Správca súborov -Name[sl]=Upravljanje datotek -Name[sr]=Управљање фајловима -Name[sr@Latn]=Upravljanje fajlovima -Name[sv]=Filhantering -Name[ta]=கோப்பு மேலாண்மை -Name[te]=దస్త్ర నిర్వహణ -Name[tg]=Мудирияти файл -Name[th]=การจัดการแฟ้ม -Name[tr]=Dosya Yöneticisi -Name[tt]=Birem İdäräçe -Name[uk]=Керування файлами -Name[uz]=Fayl boshqaruvi -Name[uz@cyrillic]=Файл бошқаруви -Name[ven]=Malangulelel a Faela -Name[vi]=Quản lí Tập tin -Name[wa]=Manaedjî les fitchîs -Name[xh]=Uphatho Lwefayile -Name[zh_CN]=文件管理器 -Name[zh_TW]=檔案管理 -Name[zu]=Ukuphathwa kwamafayela RootItem=Container0 View1_LinkedView=true View1_PassiveMode=true diff --git a/konqueror/profile_filepreview.desktop b/konqueror/profile_filepreview.desktop index 36ef894f0..df404a9e7 100644 --- a/konqueror/profile_filepreview.desktop +++ b/konqueror/profile_filepreview.desktop @@ -7,84 +7,6 @@ Container2_Orientation=Horizontal Container2_SplitterSizes=295,493 Height=550 Name=File Preview -Name[af]=Lêer Voorskou -Name[ar]=معاينة الملف -Name[az]=Fayl Nümayişi -Name[be]=Прагляд файлаў -Name[bn]=ফাইল প্রাকদর্শন -Name[br]=Rakgwel restr -Name[bs]=Pregled datoteke -Name[ca]=Previsualitza el fitxer -Name[cs]=Náhled souboru -Name[csb]=Pòdzérk lopków -Name[cy]=Rhagolwg Ffeil -Name[da]=Filforhåndsvisning -Name[de]=Dateivorschau -Name[el]=Προεπισκόπηση αρχείων -Name[eo]=Dosierantaŭrigardo -Name[es]=Vista previa de archivo -Name[et]=Faili eelvaatlus -Name[eu]=Fitxategiaren aurrebista -Name[fa]=پیشنمایش پرونده -Name[fi]=Tiedoston esikatselu -Name[fr]=Aperçu de fichier -Name[fy]=Triem foarbyld -Name[ga]=Réamhamharc Comhaid -Name[gl]=Antevista de Arquivos -Name[he]=תצוגת קבצים מקדימה -Name[hi]=फ़ाइल पूर्वावलोकन -Name[hr]=Pregled datoteke -Name[hu]=Fájlkezelés előnézettel -Name[id]=Kilasan berkas -Name[is]=Prentsýn -Name[it]=Anteprima file -Name[ja]=ファイルプレビュー -Name[ka]=ფაილთა წინასწარ შეთვალიერება -Name[kk]=Файдарды алдын-ала қарау -Name[km]=មើលឯកសារជាមុន -Name[ko]=파일 미리보기 -Name[lo]=ສະແດງຕົວຢ່າງແຟ້ມ -Name[lt]=Bylų peržiūra -Name[lv]=Failu Apskate -Name[mk]=Преглед на датотеки -Name[mn]=Файл урьд. харах -Name[ms]=Prapapar Fail -Name[mt]=Previżjoni tal-Fajl -Name[nb]=Filvisning -Name[nds]=Datei-Vöransicht -Name[ne]=फाइल पूर्वावलोकन -Name[nl]=Bestandsvoorbeeld -Name[nn]=Filvising -Name[nso]=Ponelopele ya Faele -Name[pa]=ਫਾਇਲ਼ ਝਲਕ -Name[pl]=Podgląd plików -Name[pt]=Previsão de Ficheiros -Name[pt_BR]=Pré-visualização de arquivo -Name[ro]=Previzualizare fișiere -Name[ru]=Предварительный просмотр файлов -Name[rw]=Igaragazambere ry'Idosiye -Name[se]=Fiilačájeheapmi -Name[sk]=Prehliadanie súborov -Name[sl]=Datoteka za ogled -Name[sr]=Преглед фајлова -Name[sr@Latn]=Pregled fajlova -Name[sv]=Förhandsgranska fil -Name[ta]=கோப்பு முன்காட்சி -Name[te]=దస్త్ర ముందు వీక్షణ -Name[tg]=Пешнамоиши файл -Name[th]=แสดงตัวอย่างแฟ้ม -Name[tr]=Dosya Önizleme -Name[tt]=Birem Kürsätüçe -Name[uk]=Перегляд файлів -Name[uz]=Faylni koʻrib chiqish -Name[uz@cyrillic]=Файлни кўриб чиқиш -Name[ven]=Mbonelephanda ya Faela -Name[vi]=Xem trước Tập tin -Name[wa]=Prévoeyaedje des fitchîs -Name[xh]=Imboniselo yasekuqaleni Yefayile -Name[zh_CN]=文件预览 -Name[zh_TW]=檔案預覽 -Name[zu]=Umbukiso wangaphambili wefayela RootItem=Container0 View1_LinkedView=true View1_LockedLocation=false diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop index b46628663..d3977c74c 100644 --- a/konqueror/profile_kde_devel.desktop +++ b/konqueror/profile_kde_devel.desktop @@ -1,75 +1,6 @@ [Profile] FullScreen=false Name=TDE Development -Name[af]=TDE Ontwikkeling -Name[ar]=تطوير TDE -Name[az]=TDE İnkişafı -Name[be]=Распрацоўка TDE -Name[bn]=কে.ডি.ই. ডেভেলপমেন্ট -Name[bs]=TDE programiranje -Name[ca]=Desenvolupament TDE -Name[cs]=Vývoj TDE -Name[csb]=Rozwij TDE -Name[cy]=Datblygu TDE -Name[da]=TDE-Udvikling -Name[de]=TDE-Entwicklung -Name[el]=Ανάπτυξη του TDE -Name[eo]=TDE-Programado -Name[es]=Desarrollo de TDE -Name[et]=TDE arendus -Name[eu]=TDEren garapena -Name[fa]=توسعۀ TDE -Name[fi]=TDE:n kehitystyökalut -Name[fr]=Développement de TDE -Name[fy]=TDE-ûntwikkeling -Name[ga]=Forbairt TDE -Name[gl]=Desenvolvemento de TDE -Name[he]=פיתוח של TDE -Name[hi]=केडीई डेवलपमेंट -Name[hr]=TDE razvoj -Name[hu]=TDE-s fejlesztés -Name[is]=TDE þróun -Name[it]=Sviluppo TDE -Name[ja]=TDE 開発 -Name[ka]=TDE-ში პროგრამირება -Name[kk]=TDE жүйесін жетілдіру -Name[km]=ការអភិវឌ្ឍន៍ TDE -Name[ko]=TDE 개발 -Name[lt]=TDE vystymas -Name[lv]=TDE Izstrāde -Name[mk]=Развој на TDE -Name[ms]=Pembangunan TDE -Name[mt]=Żvilupp TDE -Name[nb]=TDE-utvikling -Name[nds]=TDE-Utwickeln -Name[ne]=TDE विकास -Name[nl]=TDE-ontwikkeling -Name[nn]=TDE-utvikling -Name[pa]=TDE ਵਿਕਾਸ -Name[pl]=Rozwijanie TDE -Name[pt]=Desenvolvimento do TDE -Name[pt_BR]=Desenvolvimento do TDE -Name[ro]=Dezvoltare TDE -Name[ru]=Разработка в TDE -Name[rw]=TDE Ikoraporogaramu -Name[se]=TDE-ovdánahttin -Name[sk]=Vývoj TDE -Name[sl]=Razvoj TDE -Name[sr]=TDE развој -Name[sr@Latn]=TDE razvoj -Name[sv]=TDE-utveckling -Name[ta]=TDE உருவாக்கம் -Name[te]=కెడిఈ డెవలప్ మెంట్ -Name[th]=พัฒนาโปรแกรม TDE -Name[tr]=TDE Geliştirme -Name[tt]=TDE Citeşterü -Name[uk]=Розробка TDE -Name[uz]=TDE uchun dasturlashtirish -Name[uz@cyrillic]=TDE учун дастурлаштириш -Name[vi]=Phát triển TDE -Name[wa]=Diswalpaedje TDE -Name[zh_CN]=TDE 开发 -Name[zh_TW]=TDE 程式開發 RootItem=Tabs0 Tabs0_Children=ViewT0,ViewT1,ViewT2,ViewT3,ViewT4 Tabs0_activeChildIndex=0 diff --git a/konqueror/profile_midnightcommander.desktop b/konqueror/profile_midnightcommander.desktop index 12dbb442d..8c855ba29 100644 --- a/konqueror/profile_midnightcommander.desktop +++ b/konqueror/profile_midnightcommander.desktop @@ -7,25 +7,6 @@ Container1_Orientation=Horizontal Container1_SplitterSizes=100,100 Height=658 Name=Midnight Commander -Name[bn]=মিডনাইট কমান্ডার -Name[eo]=Meznokta komandanto -Name[fa]=فرماندۀ نیمهشب -Name[hi]=मिडनाइट कमांडर -Name[km]=ពាក្យបញ្ជា Midnight -Name[ko]=미드나잇 커맨더 -Name[lo]=ມິດໄນຄອມມານເດີ -Name[lv]=Pusnakts Komandieris -Name[ms]=Pemberi Arahan Tengah Malam -Name[ne]=मिडनाइट आदेश -Name[nso]=Molaedi wa Bosegogare -Name[pa]=ਮਿਡਨਾਇਟ ਕਮਾਂਡਰ -Name[rw]=Mutangabwiriza Hagati-Ijoro -Name[ta]=நடு இரவு கட்டளை -Name[tg]=Фармондиҳандаи нимаи шаб -Name[th]=มิดไนท์คอมมานเดอร์ -Name[ven]=Muhulwane wa vhukati ha vhusiku -Name[xh]=Umyaleli Waphakathi kobusuku -Name[zu]=Umyaleli waphakathi nobusuku RootItem=Container0 View2_LinkedView=true View2_PassiveMode=false diff --git a/konqueror/profile_simplebrowser.desktop b/konqueror/profile_simplebrowser.desktop index 21deaa0ec..166aee1a0 100644 --- a/konqueror/profile_simplebrowser.desktop +++ b/konqueror/profile_simplebrowser.desktop @@ -1,75 +1,5 @@ [Profile] Name=Simple Browser -Name[af]=Eenvoudige Blaaier -Name[ar]=متصفح بسيط -Name[az]=Sadə Səyyah -Name[be]=Звычайны вандроўнік -Name[bn]=সরল ব্রাউজার -Name[bs]=Jednostavan web preglednik -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 Navigator -Name[el]=Απλός περιηγητής ιστού -Name[eo]=Simpla TTT-legilo -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[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[ko]=간단한 탐색기 -Name[lt]=Paprasta naršyklė -Name[lv]=Vienkāršs pārlūks -Name[mk]=Едноставен прелистувач -Name[ms]=Pelayar Mudah -Name[mt]=Browser Sempliċi -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[rw]=Mucukumubuzi Yoroheje -Name[se]=Oktageardánis fierpmádatlogan -Name[sk]=Jednoduchý prehliadač -Name[sl]=Preprost brskalnik -Name[sr]=Једноставан прегледач -Name[sr@Latn]=Jednostavan pregledač -Name[sv]=Enkel webbläsning -Name[ta]=எளிய உலாவி -Name[te]=సరళ బ్రౌజర్ -Name[tg]=Браузери осон -Name[th]=โปรแกรมท่องเว็บแบบเรียบง่าย -Name[tr]=Sade Tarayıcı -Name[tt]=Ciñel Browser -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[zh_CN]=简单浏览器 -Name[zh_TW]=簡易瀏覽器 XMLUIFile=konq-simplebrowser.rc RootItem=View0 View0_ServiceName=konq_aboutpage diff --git a/konqueror/profile_tabbedbrowsing.desktop b/konqueror/profile_tabbedbrowsing.desktop index c356f8816..a07c9f532 100644 --- a/konqueror/profile_tabbedbrowsing.desktop +++ b/konqueror/profile_tabbedbrowsing.desktop @@ -1,76 +1,6 @@ [Profile] FullScreen=false Name=Tabbed Browsing -Name[af]=Oortjie Blaaier -Name[ar]=التصفح المبوب -Name[az]=Səkməli Səyyah -Name[be]=Вандроўка з укладкамі -Name[bn]=ট্যাব সম্বলিত ব্রাউজিং -Name[br]=Furchal gant bevennigoù -Name[bs]=Pregled weba sa tabovima -Name[ca]=Navegació amb pestanyes -Name[cs]=Prohlížení se záložkami -Name[csb]=Przezéranié kartama -Name[cy]=Pori Tabiedig -Name[da]=Fanebladssøgning -Name[de]=Navigation mit Unterfenstern -Name[el]=Περιήγηση με καρτέλες -Name[eo]=langeta foliumado -Name[es]=Navegación con solapas -Name[et]=Kaartidega lehitsemine -Name[eu]=Fitxa bitarteko arakaketa -Name[fa]=مرورگر تبشده -Name[fi]=Välilehdillä varustettu selain -Name[fr]=Navigation par onglets -Name[fy]=Blêder mei ljeppers -Name[ga]=Brabhsáil le Cluaisíní -Name[gl]=Navegación con Pestanas -Name[he]=גלישה בכרטיסיות -Name[hi]=टैब्ड ब्राउज़िंग -Name[hr]=Pregledavanje u karticama -Name[hu]=Lapozós böngésző -Name[is]=Flipað flak -Name[it]=Navigazione a schede -Name[ja]=タブブラウズ -Name[ka]=დაფებზე ჩვენება -Name[kk]=Қойындылы браузер -Name[km]=ការរុករកជាផ្ទាំង -Name[ko]=탭 브라우징 -Name[lt]=Naršymas kortelėse -Name[lv]=Tabota pārlūkošana -Name[mk]=Прелистување со ливчиња -Name[ms]=Pelayaran Bertab -Name[mt]=Browsing bit-tabs -Name[nb]=Nettleser med faner -Name[nds]=Nettkieken mit Paneels -Name[ne]=ट्याब गरिएको ब्राउजिङ -Name[nl]=Browser met tabbladen -Name[nn]=Nettlesar med faner -Name[pa]=ਟੈਬ ਝਲਕੀ -Name[pl]=Przeglądanie wielu stron w jednym oknie -Name[pt]=Navegação por Páginas -Name[pt_BR]=Navegação em Abas -Name[ro]=Navigare cu subferestre -Name[ru]=Браузер с вкладками -Name[rw]=Icukumbura rifite Udufishifi -Name[se]=Fierpmádatlogan mas leat gilkorat -Name[sk]=Prehliadač s kartami -Name[sl]=Brskanje v zavihkih -Name[sr]=Прегледање са језичцима -Name[sr@Latn]=Pregledanje sa jezičcima -Name[sv]=Webbläsning med flikar -Name[ta]=தத்தும் உலாவி -Name[te]=టాబ్ బ్రౌజింగ్ -Name[th]=ท่องเว็บแบบใช้แท็บ -Name[tr]=Sekmeli Tarama -Name[tt]=Tabaqlı Browser -Name[uk]=Навігація з вкладками -Name[uz]=Tabli veb koʻrish -Name[uz@cyrillic]=Табли веб кўриш -Name[vi]=Duyệt bằng cách chuyển Thẻ -Name[wa]=Naiviaedje waibe avou des linwetes -Name[zh_CN]=标签式浏览 -Name[zh_TW]=分頁瀏覽 RootItem=Tabs0 Tabs0_Children=ViewT0,ViewT1,ViewT2,ViewT3 Tabs0_activeChildIndex=0 diff --git a/konqueror/profile_webbrowsing.desktop b/konqueror/profile_webbrowsing.desktop index c598ecdde..7df307c46 100644 --- a/konqueror/profile_webbrowsing.desktop +++ b/konqueror/profile_webbrowsing.desktop @@ -1,83 +1,5 @@ [Profile] Name=Web Browsing -Name[af]=Web Blaaier -Name[ar]=تصفح الشبكة -Name[az]=Veb Gəzintisi -Name[be]=Вандроўка па Сеціве -Name[bn]=ওয়েব ব্রাউজিং -Name[br]=Furchal ar Gwiad -Name[bs]=Pretraživanje weba -Name[ca]=Navegació Web -Name[cs]=Prohlížení internetu -Name[csb]=Przezéranié sécë -Name[cy]=Pori'r W? -Name[da]=Netsøgning -Name[de]=Internetnavigator -Name[el]=Περιήγηση ιστού -Name[eo]=TTTumado -Name[es]=Navegación en Web -Name[et]=Veebi lehitsemine -Name[eu]=Web arakaketa -Name[fa]=مرورگر وب -Name[fi]=WWW-selailu -Name[fr]=Navigation web -Name[fy]=Webblêdzje -Name[ga]=Brabhsáil Lín -Name[gl]=Navegación Web -Name[he]=גלישה באינטרנט -Name[hi]=वेब ब्राउजिंग -Name[hr]=Pregledavanje Interneta -Name[hu]=Webböngésző -Name[id]=Menjelajahi Web -Name[is]=Flakk um vefinn -Name[it]=Navigazione Web -Name[ja]=ウェブ閲覧 -Name[ka]=ვების ჩვენება -Name[kk]=Веб браузер -Name[km]=ការរុករកបណ្ដាញ -Name[ko]=웹 브라우징 -Name[lo]=ຮງກເບິ່ງເວ໊ບເພຈ -Name[lt]=Žiniatinklio naršymas -Name[lv]=Tīmekļa Pārlūkošana -Name[mk]=Веб-прелистување -Name[mn]=Вэб-Хөтөч -Name[ms]=Pelayaran Web -Name[nb]=Nettlesing -Name[nds]=Nettkieken -Name[ne]=वेब ब्राउजिङ -Name[nl]=Webbrowsen -Name[nn]=Vevsurfing -Name[nso]=Boinyakisi bja Web -Name[oc]=Navigacion Oeb -Name[pa]=ਵੈੱਬ ਝਲਕ -Name[pl]=Przeglądanie sieci -Name[pt]=Navegação Web -Name[pt_BR]=Navegação Web -Name[ro]=Navigare WEB -Name[ru]=Веб-браузер -Name[rw]=Icukumbura ry'Urubugamakuru -Name[se]=Fierpmádatgolgadeapmi -Name[sk]=Web prehliadanie -Name[sl]=Brskanje po spletu -Name[sr]=Прегледање Веба -Name[sr@Latn]=Pregledanje Veba -Name[sv]=Webbläsning -Name[ta]=வலை உலாவி -Name[te]=వెబ్ బ్రౌజింగ్ -Name[tg]=Тафсири Вэб -Name[th]=เรียกดูเว็บ -Name[tr]=Web Tarama -Name[tt]=Web Küzätü -Name[uk]=Навігація Тенет -Name[uz]=Veb koʻrish -Name[uz@cyrillic]=Веб кўриш -Name[ven]=Burausini ya Webu -Name[vi]=Duyệt Mạng -Name[wa]=Naiviaedje waibe -Name[xh]=Ukhangelo lwencwadi ze Web -Name[zh_CN]=Web 浏览 -Name[zh_TW]=網頁瀏覽 -Name[zu]=Ukucinga kwi-Web RootItem=View0 View0_ServiceName=konq_aboutpage View0_ServiceType=KonqAboutPage diff --git a/konqueror/quickprint/CMakeLists.txt b/konqueror/quickprint/CMakeLists.txt index 29bb04443..6a51ac564 100644 --- a/konqueror/quickprint/CMakeLists.txt +++ b/konqueror/quickprint/CMakeLists.txt @@ -9,11 +9,14 @@ # ################################################# -install( FILES +tde_create_translated_desktop( + SOURCE text-print.desktop text-html-print.desktop text-css-print.desktop text-ada-print.desktop text-c++-print.desktop text-c++h-print.desktop text-ch-print.desktop text-diff-print.desktop text-java-print.desktop text-log-print.desktop text-makefile-print.desktop text-pas-print.desktop text-perl-print.desktop text-python-print.desktop text-tcl-print.desktop text-tex-print.desktop text-xslt-print.desktop text-xml-print.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus ) + DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus + PO_DIR konqueror-desktops +) diff --git a/konqueror/quickprint/text-ada-print.desktop b/konqueror/quickprint/text-ada-print.desktop index 8fd0aaeed..55f333b4c 100644 --- a/konqueror/quickprint/text-ada-print.desktop +++ b/konqueror/quickprint/text-ada-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-c++-print.desktop b/konqueror/quickprint/text-c++-print.desktop index afd853d99..ce40dae7c 100644 --- a/konqueror/quickprint/text-c++-print.desktop +++ b/konqueror/quickprint/text-c++-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-c++h-print.desktop b/konqueror/quickprint/text-c++h-print.desktop index b563b51e5..671abd8ad 100644 --- a/konqueror/quickprint/text-c++h-print.desktop +++ b/konqueror/quickprint/text-c++h-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-c-print.desktop b/konqueror/quickprint/text-c-print.desktop index 920395598..27618c98e 100644 --- a/konqueror/quickprint/text-c-print.desktop +++ b/konqueror/quickprint/text-c-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-ch-print.desktop b/konqueror/quickprint/text-ch-print.desktop index f6101fda4..97244d142 100644 --- a/konqueror/quickprint/text-ch-print.desktop +++ b/konqueror/quickprint/text-ch-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-css-print.desktop b/konqueror/quickprint/text-css-print.desktop index 49d567c52..2af01ae18 100644 --- a/konqueror/quickprint/text-css-print.desktop +++ b/konqueror/quickprint/text-css-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-diff-print.desktop b/konqueror/quickprint/text-diff-print.desktop index 66635d1f9..bb8dca346 100644 --- a/konqueror/quickprint/text-diff-print.desktop +++ b/konqueror/quickprint/text-diff-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-html-print.desktop b/konqueror/quickprint/text-html-print.desktop index 3d68e4a0e..1a1ebd133 100644 --- a/konqueror/quickprint/text-html-print.desktop +++ b/konqueror/quickprint/text-html-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-java-print.desktop b/konqueror/quickprint/text-java-print.desktop index 0e4719ff6..3a1ee6631 100644 --- a/konqueror/quickprint/text-java-print.desktop +++ b/konqueror/quickprint/text-java-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-log-print.desktop b/konqueror/quickprint/text-log-print.desktop index 302e9289f..e026d9738 100644 --- a/konqueror/quickprint/text-log-print.desktop +++ b/konqueror/quickprint/text-log-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-makefile-print.desktop b/konqueror/quickprint/text-makefile-print.desktop index 221b8d3ae..6ac19f822 100644 --- a/konqueror/quickprint/text-makefile-print.desktop +++ b/konqueror/quickprint/text-makefile-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-pas-print.desktop b/konqueror/quickprint/text-pas-print.desktop index e39543980..107388b2f 100644 --- a/konqueror/quickprint/text-pas-print.desktop +++ b/konqueror/quickprint/text-pas-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-perl-print.desktop b/konqueror/quickprint/text-perl-print.desktop index 8bd03f192..946e565bc 100644 --- a/konqueror/quickprint/text-perl-print.desktop +++ b/konqueror/quickprint/text-perl-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-print.desktop b/konqueror/quickprint/text-print.desktop index 242a68334..b150ecfa5 100644 --- a/konqueror/quickprint/text-print.desktop +++ b/konqueror/quickprint/text-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-python-print.desktop b/konqueror/quickprint/text-python-print.desktop index 65e142f04..730fe84c1 100644 --- a/konqueror/quickprint/text-python-print.desktop +++ b/konqueror/quickprint/text-python-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-tcl-print.desktop b/konqueror/quickprint/text-tcl-print.desktop index 6d8316b35..52eee8722 100644 --- a/konqueror/quickprint/text-tcl-print.desktop +++ b/konqueror/quickprint/text-tcl-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-tex-print.desktop b/konqueror/quickprint/text-tex-print.desktop index aa9056789..0c36ad75e 100644 --- a/konqueror/quickprint/text-tex-print.desktop +++ b/konqueror/quickprint/text-tex-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-xml-print.desktop b/konqueror/quickprint/text-xml-print.desktop index 0f2479322..00e658301 100644 --- a/konqueror/quickprint/text-xml-print.desktop +++ b/konqueror/quickprint/text-xml-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/quickprint/text-xslt-print.desktop b/konqueror/quickprint/text-xslt-print.desktop index 24c501406..eb729e32b 100644 --- a/konqueror/quickprint/text-xslt-print.desktop +++ b/konqueror/quickprint/text-xslt-print.desktop @@ -4,76 +4,5 @@ Actions=Print; [Desktop Action Print] Name=Print... -Name[af]=Druk... -Name[ar]=طباعة... -Name[az]=Çap et... -Name[be]=Друкаваць... -Name[bg]=Печат... -Name[bn]=ছাপাও... -Name[br]=Moulañ ... -Name[bs]=Štampaj... -Name[ca]=Imprimeix... -Name[cs]=Tisknout... -Name[csb]=Drëkùjë... -Name[cy]=Argraffu... -Name[da]=Udskriv... -Name[de]=Drucken ... -Name[el]=Εκτύπωση... -Name[eo]=Printi... -Name[es]=Imprimir... -Name[et]=Trüki... -Name[eu]=Inprimatu... -Name[fa]=چاپ... -Name[fi]=Tulosta... -Name[fr]=Imprimer... -Name[fy]=Printsje... -Name[ga]=Priontáil... -Name[gl]=Imprimir... -Name[he]=הדפס... -Name[hi]=छापें... -Name[hr]=Ispiši... -Name[hu]=Nyomtatás... -Name[is]=Prenta... -Name[it]=Stampa... -Name[ja]=印刷... -Name[ka]=ბეჭდვა... -Name[kk]=Басып шығару... -Name[km]=បោះពុម្ព... -Name[ko]=인쇄... -Name[lv]=Drukāt... -Name[mk]=Печати... -Name[ms]=Cetak... -Name[mt]=Ipprintja... -Name[nb]=Skriv ut … -Name[nds]=Drucken... -Name[ne]=मुद्रण... -Name[nl]=Afdrukken... -Name[nn]=Skriv ut … -Name[pa]=ਛਪਾਈ... -Name[pl]=Drukuj... -Name[pt]=Imprimir... -Name[pt_BR]=Imprimir... -Name[ro]=Tipărește... -Name[ru]=Печать... -Name[rw]=Gucapa... -Name[se]=Čálit … -Name[sk]=Tlač... -Name[sl]=Natisni ... -Name[sr]=Штампа... -Name[sr@Latn]=Štampa... -Name[sv]=Skriv ut... -Name[ta]=அச்சடி... -Name[te]=ప్రచురించు... -Name[tg]=Чоп кардан... -Name[th]=พิมพ์... -Name[tr]=Yazdır... -Name[tt]=Bastıru... -Name[uk]=Друк... -Name[uz]=Bosib chiqarish -Name[uz@cyrillic]=Босиб чиқариш -Name[vi]=In ấn... -Name[wa]=Rexhe... -Name[zh_CN]=打印... -Name[zh_TW]=列印... Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U Icon=document-print-preview diff --git a/konqueror/remoteencodingplugin/CMakeLists.txt b/konqueror/remoteencodingplugin/CMakeLists.txt index 35c947858..a9e3b7f94 100644 --- a/konqueror/remoteencodingplugin/CMakeLists.txt +++ b/konqueror/remoteencodingplugin/CMakeLists.txt @@ -24,13 +24,21 @@ link_directories( ##### other data ################################ -install( FILES - kremoteencodingplugin.rc kremoteencodingplugin.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqiconview/kpartplugins ) +tde_create_translated_desktop( + SOURCE kremoteencodingplugin.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqiconview/kpartplugins + PO_DIR konqueror-desktops +) + +install( + FILES kremoteencodingplugin.rc + DESTINATION ${DATA_INSTALL_DIR}/konqiconview/kpartplugins +) -install( FILES - kremoteencodingplugin.rc kremoteencodingplugin.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqlistview/kpartplugins ) +install( + FILES kremoteencodingplugin.rc ${CMAKE_CURRENT_BINARY_DIR}/kremoteencodingplugin.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqlistview/kpartplugins +) ##### konq_remoteencoding (module) ############## diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 8889861b3..c44aaa342 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -50,16 +50,16 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, { m_menu = new TDEActionMenu(i18n("Select Remote Charset"), "charset", actionCollection(), "changeremoteencoding"); - connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotAboutToShow())); + connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShow())); m_menu->setEnabled(false); m_menu->setDelayed(false); - m_part = tqt_dynamic_cast<KonqDirPart*>(parent); + m_part = dynamic_cast<KonqDirPart*>(parent); if (m_part) // if parent is not a KonqDirPart, our menu will never show - TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()), - this, TQT_SLOT(slotAboutToOpenURL())); + TQObject::connect(m_part, TQ_SIGNAL(aboutToOpenURL()), + this, TQ_SLOT(slotAboutToOpenURL())); } KRemoteEncodingPlugin::~KRemoteEncodingPlugin() @@ -117,11 +117,11 @@ KRemoteEncodingPlugin::fillMenu() TQStringList::ConstIterator it; int count = 0; for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it) - menu->insertItem(*it, this, TQT_SLOT(slotItemSelected(int)), 0, ++count); + menu->insertItem(*it, this, TQ_SLOT(slotItemSelected(int)), 0, ++count); menu->insertSeparator(); - menu->insertItem(i18n("Reload"), this, TQT_SLOT(slotReload()), 0, ++count); - menu->insertItem(i18n("Default"), this, TQT_SLOT(slotDefault()), 0, ++count); + menu->insertItem(i18n("Reload"), this, TQ_SLOT(slotReload()), 0, ++count); + menu->insertItem(i18n("Default"), this, TQ_SLOT(slotDefault()), 0, ++count); m_idDefault = count; } diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop b/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop index bf698ee21..02b54c01f 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop @@ -11,125 +11,5 @@ X-TDE-ParentApp=konqueror Icon=charset Name=Remote Encoding -Name[af]=Afgeleë Enkodering Inprop Module -Name[ar]=قابس الترميز البعيد -Name[be]=Утулка аддаленага знаказбору -Name[bg]=Отдалечена кодова таблица -Name[bn]=দূরবর্তী এনকোডিং প্লাগ-ইন -Name[bs]=Dodatak za udaljeno kodiranje -Name[ca]=Endollable de codificació remota -Name[cs]=Modul vzdáleného kódování -Name[csb]=Plugins daleczégò kòdowaniô -Name[da]=Plugin for fjernkodning -Name[de]=Entfernte Kodierung -Name[el]=Πρόσθετο απομακρυσμένης κωδικοποίησης -Name[eo]=Fora kodoprezento Kromaĵo -Name[es]=Complemento de codificación remota -Name[et]=Võrgukodeeringu plugin -Name[eu]=Urruneko kodeketa plugina -Name[fa]=وصلۀ کدبندی دور -Name[fi]=Etämerkinmuunnosliitännäinen -Name[fr]=Module d'encodage distant -Name[fy]=Eksterne-kodearringsplugin -Name[gl]=Plugin de Codificación Remota -Name[he]=תוסף קידוד מרוחק -Name[hr]=Dodatak za udaljeno kodiranje -Name[hu]=Távoli kódolás modul -Name[is]=Fjarlægt kóðunaríforrit -Name[it]=Plugin codifica remota -Name[ja]=リモートエンコーディングプラグイン -Name[ka]=კოდირების დაშორებული მოდული -Name[kk]=Қашықтан баптау -Name[km]=កម្មវិធីជំនួយការអ៊ិនកូដពីចម្ងាយ -Name[ko]=원격 인코딩 플러그인 -Name[lt]=Nutolusių vietų koduotės priedas -Name[mk]=Приклучок за оддалечено кодирање -Name[ms]=Plugin Pengekodan Jauh -Name[nb]=Eksterne kodingsprogramtillegg -Name[nds]=Plugin för feern Koderen -Name[ne]=टाढा सङ्केतन प्लगइन -Name[nl]=Externe-coderingsplugin -Name[nn]=Eksterne kodingsprogramtillegg -Name[pa]=ਰਿਮੋਟ ਇੰਕੋਡਿੰਗ ਪਲੱਗਇਨ -Name[pl]=Wtyczka zdalnego kodowania -Name[pt]='Plugin' de Codificação Remota -Name[pt_BR]=Plug-in de Codificação Remota -Name[ro]=Plugin de încodare la distanță -Name[ru]=Кодировка имён файлов на сервере -Name[rw]=Icomeka Gusobeka bya Kure -Name[se]=Gáiddus koden lassemoduvla -Name[sk]=Modul pre šifrovanie -Name[sl]=Vstavek Oddaljeno kodiranje -Name[sr]=Прикључак за удаљено кодирање -Name[sr@Latn]=Priključak za udaljeno kodiranje -Name[sv]=Insticksprogram för fjärrkodning -Name[ta]=தொலைதூர குறியீட்டு சொருகுப்பொருள் -Name[th]=ปลั๊กอินเข้ารหัสทางไกล -Name[tr]=Uzaktan Şifreleme Eklentisi -Name[uk]=Втулок віддаленого кодування -Name[vi]=Trình bổ sung Mã hoá Trên mạng -Name[wa]=Tchôke-divins d' ecôdaedje å lon -Name[zh_CN]=远程编码插件 -Name[zh_TW]=遠端編碼外掛程式 Comment=A Plugin for setting the encoding of remote hosts (FTP, SSH, etc.) -Comment[af]=Afgeë enkodering inprop module vir Konqueror -Comment[ar]=قابس الترميز البعيد لِــ Konqueror -Comment[be]=Утулка аддаленага знаказбору для Konqueror -Comment[bg]=Приставка за отдалечена кодова таблица на браузъра -Comment[bn]=কনকরার-এর জন্য দূরবর্তী এনকোডিং প্লাগ-ইন -Comment[bs]=Dodatak za udaljeno kodiranje za Konqueror -Comment[ca]=Endollable de codificació remota per a Konqueror -Comment[cs]=Modul vzdáleného kódování pro Konqueror -Comment[csb]=Plugins daleczégò kòdowaniô dlô Konquerora -Comment[da]=Plugin for fjernkodning i Konqueror -Comment[de]=Eine Erweiterung zum Einstellen der Kodierung entfernter Rechner (FTP, SSH, etc.) -Comment[el]=Πρόσθετο απομακρυσμένης κωδικοποίησης για τον Konqueror -Comment[eo]=Fora kodoprezento Kromaĵo por Konkeranto -Comment[es]=Complemento de codificación remota para Konqueror -Comment[et]=Konquerori võrgukodeeringu plugin -Comment[eu]=Konquerorren urruneko kodeketa plugina -Comment[fa]=وصلۀ کدبندی دور برای Konqueror -Comment[fi]=Etämerkinmuunnosliitännäinen Konquerorille -Comment[fr]=Module d'encodage distant pour Konqueror -Comment[fy]=Eksterne-kodearringsplugin foar Konqueror -Comment[gl]=Plugin de codificación remota para Konqueror -Comment[he]=תוסף קידוד מרוחק עבור Konqueror -Comment[hr]=Dodatak za udaljeno kodiranje namijenjen Konqueroru -Comment[hu]=Távoli kódolás bővítőmodul a Konqueror böngészőhöz -Comment[is]=Fjarlægt kóðunaríforrit fyrir Konqueror -Comment[it]=Plugin per la codifica remota di Konqueror -Comment[ja]=Konqueror 用のリモートエンコーディングプラグイン -Comment[ka]=კოდირების დაშორებული მოდული Konqueror-ისთვის -Comment[kk]=Қашықтан баптау модулі -Comment[km]=កម្មវិធីជំនួយការអ៊ិនកូដសម្រាប់ Konqueror -Comment[ko]=Konqueror 원격 인코딩 플러그인 -Comment[lt]=Nutolusių vietų koduotės Konqueror priedas -Comment[mk]=Приклучок за оддалечено кодирање за Konqueror -Comment[ms]=Plugin Pengekodan Jauh untuk Konqueror -Comment[nb]=Eksterne kodingsprogramtillegg for Konqueror -Comment[nds]=Konqueror-Plugin för feern Koderen -Comment[ne]=कन्क्वेररका लागि टाढा सङ्केतन प्लगइन -Comment[nl]=Externe-coderingsplugin voor Konqueror -Comment[nn]=Eksterne kodingsprogramtillegg for Konqueror -Comment[pa]=ਕੋਨਕਿਉਰੋਰ ਲਈ ਰਿਮੋਟ ਇੰਕੋਡਿੰਗ ਪਲੱਗਇਨ -Comment[pl]=Wtyczka zdalnego kodowania dla Konquerora -Comment[pt]=Um 'Plugin' de Codificação Remota para o Konqueror -Comment[pt_BR]=Plug-in de Codificação Remota para o Konqueror -Comment[ro]=Plugin de încodare la distanță pentru Konqueror -Comment[ru]=Выбор кодировки для файлов на сервере -Comment[rw]=Icomeka Gusobeka rya Kure rijyanye na Konqueror -Comment[sk]=Modul pre šifrovanie pre Konqueror -Comment[sl]=Vstavek Oddaljeno kodiranje za Konqueror -Comment[sr]=Прикључак за удаљено кодирање за Konqueror -Comment[sr@Latn]=Priključak za udaljeno kodiranje za Konqueror -Comment[sv]=Insticksprogram för fjärrkodning i Konqueror -Comment[ta]=கான்கொரர்க்கான தொலைதூர குறியீட்டு சொருகுப்பொருள் -Comment[th]=ปลั้กอินเข้ารหัสทางไกลสำหรับคอนเควอร์เรอร์ -Comment[tr]=Konqueror için uzaktan şifreleme eklentisi -Comment[tt]=Konqueror öçen Remote Encoding Plugin -Comment[uk]=Втулок віддаленого кодування для Konqueror -Comment[vi]=Trình bổ sung Mã hoá Trên mạng cho Konqueror -Comment[wa]=Tchôke-divins d' ecôdaedje å lon po Konqueror -Comment[zh_CN]=Konqueror 的远程编码插件 -Comment[zh_TW]=Konqueror 的編碼外掛程式 diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index d5469cd47..b153c7990 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -32,7 +32,7 @@ class KonqDirPart; class KRemoteEncodingPlugin: public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KRemoteEncodingPlugin(TQObject * parent, const char *name, const TQStringList &); diff --git a/konqueror/shellcmdplugin/CMakeLists.txt b/konqueror/shellcmdplugin/CMakeLists.txt index 717a7464e..55b32a96d 100644 --- a/konqueror/shellcmdplugin/CMakeLists.txt +++ b/konqueror/shellcmdplugin/CMakeLists.txt @@ -24,11 +24,21 @@ link_directories( ##### other data ################################ -install( FILES kshellcmdplugin.rc kshellcmdplugin.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqiconview/kpartplugins ) +tde_create_translated_desktop( + SOURCE kshellcmdplugin.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqiconview/kpartplugins + PO_DIR konqueror-desktops +) + +install( + FILES kshellcmdplugin.rc + DESTINATION ${DATA_INSTALL_DIR}/konqiconview/kpartplugins +) -install( FILES kshellcmdplugin.rc kshellcmdplugin.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqlistview/kpartplugins ) +install( + FILES kshellcmdplugin.rc ${CMAKE_CURRENT_BINARY_DIR}/kshellcmdplugin.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqlistview/kpartplugins +) ##### konq_shellcmdplugin (module) ############## @@ -42,6 +52,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK konq-shared + LINK konq-shared tdesu-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index b4ea0cb5d..80c854fcf 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -54,9 +54,9 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& m_shell->setFocus(); - connect(cancelButton, TQT_SIGNAL(clicked()), m_shell, TQT_SLOT(slotFinished())); - connect(m_shell, TQT_SIGNAL(finished()), this, TQT_SLOT(disableStopButton())); - connect(closeButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); + connect(cancelButton, TQ_SIGNAL(clicked()), m_shell, TQ_SLOT(slotFinished())); + connect(m_shell, TQ_SIGNAL(finished()), this, TQ_SLOT(disableStopButton())); + connect(closeButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose())); } KShellCommandDialog::~KShellCommandDialog() diff --git a/konqueror/shellcmdplugin/kshellcmddialog.h b/konqueror/shellcmdplugin/kshellcmddialog.h index de6d57fee..814d61857 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.h +++ b/konqueror/shellcmdplugin/kshellcmddialog.h @@ -29,7 +29,7 @@ class KShellCommandExecutor; class KShellCommandDialog:public KDialog { - Q_OBJECT + TQ_OBJECT public: KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent=0, bool modal=false); virtual ~KShellCommandDialog(); diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index e5e8dabe4..d4d6f45f9 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -84,11 +84,11 @@ int KShellCommandExecutor::exec() return 0; } - m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, TQT_TQOBJECT(this)); - m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, TQT_TQOBJECT(this)); + m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this); + m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this); m_writeNotifier->setEnabled(false); - connect (m_readNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(readDataFromShell())); - connect (m_writeNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(writeDataToShell())); + connect (m_readNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(readDataFromShell())); + connect (m_writeNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(writeDataToShell())); return 1; } diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h index 616cdbc13..7e2e4b47d 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.h +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h @@ -28,7 +28,7 @@ class TQSocketNotifier; class KShellCommandExecutor:public TQTextView { - Q_OBJECT + TQ_OBJECT public: KShellCommandExecutor(const TQString& command, TQWidget* parent=0); virtual ~KShellCommandExecutor(); diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index 99e04fce8..1b426da2a 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -34,12 +34,12 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name, return; new TDEAction( i18n( "&Execute Shell Command..." ), "system-run", CTRL+Key_E, this, - TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); + TQ_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); } void KShellCmdPlugin::slotExecuteShellCommand() { - KonqDirPart * part = tqt_dynamic_cast<KonqDirPart *>(parent()); + KonqDirPart * part = dynamic_cast<KonqDirPart *>(parent()); if ( !part ) { KMessageBox::sorry(0L, "KShellCmdPlugin::slotExecuteShellCommand: Program error, please report a bug."); diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.desktop b/konqueror/shellcmdplugin/kshellcmdplugin.desktop index b3217713b..1bc93cd0d 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.desktop +++ b/konqueror/shellcmdplugin/kshellcmdplugin.desktop @@ -13,125 +13,5 @@ X-TDE-ParentApp=konqueror Icon=system-run Name=Run Command -Name[af]=Opdrag tolk inprop module -Name[ar]=قابس أمر المحارة -Name[be]=Утулка выканання каманды ў абалонцы -Name[bg]=Изпълнение на команда -Name[bn]=শেল কমান্ড প্লাগ-ইন -Name[bs]=Dodatak za shell naredbe -Name[ca]=Endollable d'ordres -Name[cs]=Modul shellového příkazu -Name[csb]=Plugins pòlétu pòwłoczi -Name[da]=Plugin for skalkommando -Name[de]=Befehl ausführen -Name[el]=Πρόσθετο εντολών κελύφους -Name[eo]=Ŝelkomanda kromaĵo -Name[es]=Complemento para ejecutar órdenes -Name[et]=Shellikäsu plugin -Name[eu]=Shell komandorako plugina -Name[fa]=وصلۀ فرمان پوسته -Name[fi]=Komentoriviliitännäinen -Name[fr]=Module de lignes de commande -Name[fy]=Flueslkommando-plugin -Name[gl]=Plugin para Execución de Comandos -Name[he]=תוסף הפעלת פקודה מסוף -Name[hr]=Dodatak za naredbe u ljuski -Name[hu]=Parancsvégrehajtó modul -Name[is]=Skeljarskipunar íforrit -Name[it]=Plugin per i comandi shell -Name[ja]=シェルコマンドプラグイン -Name[ka]=გარსისს ბრძანების მოდული -Name[kk]=Команда жолы -Name[km]=កម្មវិធីជំនួយពាក្យបញ្ជាសែល -Name[ko]=셸 명령 플러그인 -Name[lt]=Apvalkalo komandų priedas -Name[mk]=Приклучок за команда за школка -Name[ms]=Plugin Arahan Shell -Name[nb]=Programtillegg for skallkommandoer -Name[nds]=Plugin för Konsoolbefehlen -Name[ne]=शेल आदेश प्लगइन -Name[nl]=Schellcommando-plugin -Name[nn]=Programtillegg for skalkommandoar -Name[pa]=ਸੈੱਲ ਕਮਾਂਡ ਪਲੱਗਇਨ -Name[pl]=Wtyczka polecenia powłoki -Name[pt]='Plugin' para Executar um Comando -Name[pt_BR]=Plug-in do Shell -Name[ro]=Plugin shell pentru comenzi -Name[ru]=Выполнить команду -Name[rw]=Icomeka ry'Ibwirizwa Sheli -Name[sk]=Modul Príkaz shellu -Name[sl]=Vstavek Lupinski ukaz -Name[sr]=Прикључак за наредбе шкољке -Name[sr@Latn]=Priključak za naredbe školjke -Name[sv]=Insticksprogram för skalkommando -Name[ta]=ஓட்டு கட்டளை சொருகுப்பொருள் -Name[th]=ปลั๊กอินสำหรับป้อนคำสั่งเชลล์ -Name[tr]=Üçbirim Komut Eklentisi -Name[tt]=Qabıqqa Boyırıq birü Östämäse -Name[uk]=Втулок командної оболонки -Name[vi]=Trình bổ sung Ra lệnh qua Trình giao diện -Name[wa]=Tchôke-divins di comande shell -Name[zh_CN]=Shell 命令插件 -Name[zh_TW]=Shell 命令外掛程式 Comment=A plugin which enables commands to be executed within folders -Comment[af]=Opdrag tolk inprop module vir Konqueror -Comment[ar]=قابس أمر المحارة لِــ Konqueror -Comment[be]=Утулка выканання каманды ў абалонцы для Konqueror -Comment[bg]=Приставка за изпълнение на команда на браузъра -Comment[bn]=কনকরার-এর জন্য শেল কমান্ড প্লাগ-ইন -Comment[bs]=Dodatak za shell naredbe za Konqueror -Comment[ca]=Endollable d'ordres per a Konqueror -Comment[cs]=Modul shellového příkazu pro Konqueror -Comment[csb]=Plugins pòlétu pòwłoczi dlô Konquerora -Comment[da]=Plugin for skalkommandon i Konqueror -Comment[de]=Eine Erweiterung, welche es ermöglichst Befehle innerhalb von Ordnern auszuführen -Comment[el]=Πρόσθετο εντολών κελύφους για τον Konqueror -Comment[eo]=Ŝelo Komando Kromaĵo por Konkeranto -Comment[es]=Complemento para ejecutar órdenes desde Konqueror -Comment[et]=Konquerori shellikäsu plugin -Comment[eu]=Shell komandorako plugina Konquerorako -Comment[fa]=وصلۀ فرمان پوسته برای Konqueror -Comment[fi]=Konquerorin komentoriviliitännäinen -Comment[fr]=Module de lignes de commande pour Konqueror -Comment[fy]=In flueskommando-plugin foar Konqueror -Comment[gl]=Plugin para Execución de Comandos para Konqueror -Comment[he]=תוסף הפעלת פקודה מסוף עבור Konqueror -Comment[hr]=Dodatak za naredbe u ljuski namijenjen Konqueroru -Comment[hu]=Parancsvégrehajtó modul a Konqueror böngészőhöz -Comment[is]=Skeljarskipunar íforrit fyrir Konqueror -Comment[it]=Plugin per i comandi shell di Konqueror -Comment[ja]=Konqueror 用シェルコマンドプラグイン -Comment[ka]=გარსისს ბრძანების მოდული Konqueror-ისთვის -Comment[kk]=Команда жолы модулі -Comment[km]=កម្មវិធីជំនួយពាក្យបញ្ជាសែលសម្រាប់ Konqueror -Comment[ko]=Konqueror 셸 명령 플러그인 -Comment[lt]=Apvalkalo komandų priedas Konqueror -Comment[mk]=Приклучок за команда за школка за Konqueror -Comment[ms]=Plugin Arahan Shell untuk Konqueror -Comment[nb]=Programtillegg for skallkommandoer i Konqueror -Comment[nds]=Konsoolbefehl-Plugin för Konqueror -Comment[ne]=कन्क्वेररका लागि शेल आदेश प्लगइन -Comment[nl]=Een shellcommando-plugin voor Konqueror -Comment[nn]=Programtillegg for skalkommandoar i Konqueror -Comment[pa]=ਕੋਨਕਿਉਰੋਰ ਲਈ ਸ਼ੈਲ ਕਮਾਂਡ ਪਲੱਗਇਨ -Comment[pl]=Wtyczka polecenia powłoki dla Konquerora -Comment[pt]=Um 'Plugin' para Executar Comandos no Konqueror -Comment[pt_BR]=Plug-in de Comandos do Shell para o Konqueror -Comment[ro]=Plugin shell pentru comenzi pentru Konqueror -Comment[ru]=Выполнить команду из Konqueror -Comment[rw]=Icomeka ry'Ibwiriza Sheli rijyanye na Konqueror -Comment[sk]=Modul Príkaz pre Konqueror -Comment[sl]=Vstavek Lupinski ukaz za Konqueror -Comment[sr]=Прикључак за наредбе шкољке за Konqueror -Comment[sr@Latn]=Priključak za naredbe školjke za Konqueror -Comment[sv]=Insticksprogram för skalkommandon i Konqueror -Comment[ta]=கான்கொரர்க்கான ஓட்டு கட்டளை சொருகுப்பொருள் -Comment[th]=ปลั้กอินป้อนคำสั่งเชลล์สำหรับของคอนเควอร์เรอร์ -Comment[tr]=Konqueror için uçbirim komut eklentisi -Comment[tt]=Konqueror öçen Qabıqqa Boyırıq birü Östämäse -Comment[uk]=Втулок командної оболонки для Konqueror -Comment[vi]=Trình bổ sung Ra lệnh qua Trình giao diện cho Konqueror -Comment[wa]=Tchôke-divins di comande shell po Konqueror -Comment[zh_CN]=Konqueror 的 Shell 命令插件 -Comment[zh_TW]=Konqueror 的 Shell 指令外掛程式 diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h index 16874adc0..df11b7918 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.h +++ b/konqueror/shellcmdplugin/kshellcmdplugin.h @@ -24,7 +24,7 @@ class KShellCmdPlugin : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KShellCmdPlugin( TQObject* parent, const char* name, const TQStringList & ); ~KShellCmdPlugin() {} diff --git a/konqueror/sidebar/CMakeLists.txt b/konqueror/sidebar/CMakeLists.txt index 45e483d5a..40cd5a239 100644 --- a/konqueror/sidebar/CMakeLists.txt +++ b/konqueror/sidebar/CMakeLists.txt @@ -34,7 +34,13 @@ install( FILES konqsidebarplugin.h DESTINATION ${INCLUDE_INSTALL_DIR} ) ##### other data ################################ install( FILES konqsidebartng.rc DESTINATION ${CONFIG_INSTALL_DIR} ) -install( FILES konq_sidebartng.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + +tde_create_translated_desktop( + SOURCE konq_sidebartng.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR konqueror-desktops +) + install( FILES .version DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries ) install( FILES konqsidebartng.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) install( PROGRAMS move_konqsidebartng_entries.sh DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) diff --git a/konqueror/sidebar/konq_sidebartng.desktop b/konqueror/sidebar/konq_sidebartng.desktop index e3536a391..a593778d8 100644 --- a/konqueror/sidebar/konq_sidebartng.desktop +++ b/konqueror/sidebar/konq_sidebartng.desktop @@ -2,83 +2,6 @@ Type=Service Icon=view_sidetree Name=Navigation Panel -Name[af]=Navigasie Paneel -Name[ar]=لوحة الملاحة -Name[az]=Naviqasiya Paneli -Name[be]=Панэль навігацыі -Name[bg]=Навигационен панел -Name[bn]=ভ্রমণ প্যানেল -Name[br]=Panell furchal -Name[bs]=Panel za navigaciju -Name[ca]=Plafó de navegació -Name[cs]=Navigační panel -Name[csb]=Nawigacëjny panel -Name[cy]=Panel Llywio -Name[da]=Navigationspanel -Name[de]=Navigationsbereich -Name[el]=Πλαίσιο πλοήγησης -Name[eo]=Navigila panelo -Name[es]=Panel de navegación -Name[et]=Liikumise paneel -Name[eu]=Arakaketa panela -Name[fa]=تابلوی ناوش -Name[fi]=Navigointipaneeli -Name[fr]=Panneau de navigation -Name[fy]=Navigaasjepaniel -Name[ga]=Painéal Loingseoireachta -Name[gl]=Painel de Navegación -Name[he]=לוח ניווט -Name[hi]=नेविगेशन फलक -Name[hr]=Navigacijska ploča -Name[hu]=Navigációs panel -Name[is]=Leiðarstýrispjald -Name[it]=Pannello di navigazione -Name[ja]=ナビゲーションパネル -Name[ka]=სანავიგაციო პანელი -Name[kk]=Шарлау панелі -Name[km]=បន្ទះការរុករក -Name[ko]=탐색 패널 -Name[lo]=ຖາດນຳທາງ -Name[lt]=Navigacijos pultas -Name[lv]=Navigācijas Panelis -Name[mk]=Навигациски панел -Name[mn]=Жолоодлогын самбар -Name[ms]=Panel Navigasi -Name[mt]=Pannell ta' navigazzjoni -Name[nb]=Navigasjonspanel -Name[nds]=Navigatschoonspaneel -Name[ne]=नेभिगेसन प्यानल -Name[nl]=Navigatiepaneel -Name[nn]=Navigasjonspanel -Name[nso]=Panel ya Navigation -Name[pa]=ਏਧਰ-ਓਧਰ ਪੈਨਲ -Name[pl]=Panel nawigacyjny -Name[pt]=Painel de Navegação -Name[pt_BR]=Painel de Navegação -Name[ro]=Panou de navigare -Name[ru]=Панель навигации -Name[rw]=Umwanya w'Ibuganya -Name[se]=Navigašuvdnapanela -Name[sk]=Navigačný panel -Name[sl]=Navigacijski pult -Name[sr]=Навигациони панел -Name[sr@Latn]=Navigacioni panel -Name[sv]=Navigeringspanel -Name[ta]=நாவிகேஷன் பலகம் -Name[tg]=Сафҳаи контроли ҷустуҷӯ -Name[th]=ถาดนำทาง -Name[tr]=Dolaşma Paneli -Name[tt]=Küçü Qoraltiräse -Name[uk]=Панель навігації -Name[uz]=Yoʻlchi paneli -Name[uz@cyrillic]=Йўлчи панели -Name[ven]=Phanele ya Navigation -Name[vi]=Bảng điều khiển Duyệt -Name[wa]=Panea d' naiviaedje -Name[xh]=Iqela lenjongo Yolawulo -Name[zh_CN]=导航面板 -Name[zh_TW]=導覽面板 -Name[zu]=Iwindi lemininingwane Lokuzula MimeType=inode/directory X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=konq_sidebar diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index bfff3c8e7..437c7bda9 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -32,13 +32,13 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, // this should be your custom internal widget m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); - connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)), - this, TQT_SIGNAL(started(TDEIO::Job*))); - connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); - connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), - m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); - TDEAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget)); - setWidget(TQT_TQWIDGET(m_widget)); + connect(m_widget,TQ_SIGNAL(started(TDEIO::Job *)), + this, TQ_SIGNAL(started(TDEIO::Job*))); + connect(m_widget,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed())); + connect(m_extension, TQ_SIGNAL(addWebSideBar(const KURL&, const TQString&)), + m_widget, TQ_SLOT(addWebSideBar(const KURL&, const TQString&))); + TDEAcceleratorManager::setNoAccel(m_widget); + setWidget(m_widget); } TDEInstance *KonqSidebar::getInstance() diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index dfdd2e2e0..0e7fbdef5 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -36,7 +36,7 @@ class KonqSidebarFactory; class KonqSidebarBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: KonqSidebarBrowserExtension(KonqSidebar *part_,Sidebar_Widget *widget_,const char *name): @@ -73,7 +73,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension */ class KonqSidebar : public KParts::ReadOnlyPart, public KonqSidebarIface { - Q_OBJECT + TQ_OBJECT public: /** @@ -111,7 +111,7 @@ class TDEAboutData; class KonqSidebarFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KonqSidebarFactory(); diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index 7540ef398..367e7324d 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -32,7 +32,7 @@ class KonqSidebarPluginPrivate; class KDE_EXPORT KonqSidebarPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: KonqSidebarPlugin(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0); ~KonqSidebarPlugin(); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8eefa7c34..5fd3f6d7e 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -60,8 +60,8 @@ addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu, m_universal=universal; m_currentProfile = currentProfile; menu = addmenu; - connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu())); - connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int))); + connect(menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(aboutToShowAddMenu())); + connect(menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activatedAddMenu(int))); } void addBackEnd::aboutToShowAddMenu() @@ -268,7 +268,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (splitterWidget) { splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint); splitterWidget->setOpaqueResize( false ); - connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter())); + connect(splitterWidget,TQ_SIGNAL(setRubberbandCalled()),TQ_SLOT(userMovedSplitter())); } m_area = new KDockArea(this); @@ -292,22 +292,22 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (!m_universalMode) { m_menu->insertItem(SmallIconSet("remove"), i18n("Close Navigation Panel"), - par, TQT_SLOT(deleteLater())); + par, TQ_SLOT(deleteLater())); } - connect(m_menu, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(aboutToShowConfigMenu())); - connect(m_menu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(activatedMenu(int))); + connect(m_menu, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(aboutToShowConfigMenu())); + connect(m_menu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(activatedMenu(int))); m_buttonPopup = 0; addBackEnd *ab = new addBackEnd(this, addMenu, universalMode, currentProfile, "Sidebar_Widget-addBackEnd"); - connect(ab, TQT_SIGNAL(updateNeeded()), - this, TQT_SLOT(updateButtons())); - connect(ab, TQT_SIGNAL(initialCopyNeeded()), - this, TQT_SLOT(finishRollBack())); + connect(ab, TQ_SIGNAL(updateNeeded()), + this, TQ_SLOT(updateButtons())); + connect(ab, TQ_SIGNAL(initialCopyNeeded()), + this, TQ_SLOT(finishRollBack())); initialCopy(); @@ -327,13 +327,13 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons m_menu->setItemVisible(2, !m_immutableShowTabsLeft); m_menu->setItemVisible(3, !m_immutableShowExtraButtons); - connect(&m_configTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(saveConfig())); + connect(&m_configTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(saveConfig())); m_somethingVisible = !m_openViews.isEmpty(); doLayout(); - TQTimer::singleShot(0,this,TQT_SLOT(createButtons())); - connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), - this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*))); + TQTimer::singleShot(0,this,TQ_SLOT(createButtons())); + connect(m_area, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), + this, TQ_SLOT(dockWidgetHasUndocked(KDockWidget*))); } void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { @@ -373,7 +373,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { scf.writeEntry("X-TDE-KonqSidebarModule", "konqsidebar_web"); scf.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } } @@ -382,7 +382,7 @@ void Sidebar_Widget::finishRollBack() { m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true); initialCopy(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } @@ -508,7 +508,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) ksc.setGroup("Desktop Entry"); ksc.writeEntry("Icon",iconname); ksc.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -531,7 +531,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) //ksc.writeEntry("Name",newurl); ksc.writePathEntry("URL",newurl); ksc.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } } delete dlg; @@ -545,7 +545,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) TQFile f(m_path+m_currentButton->file); if (!f.remove()) tqDebug("Error, file not deleted"); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -566,7 +566,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) ksc.sync(); // Update the buttons with a TQTimer (why?) - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -834,11 +834,11 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) { m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name); ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name, - icon, TQT_TQOBJECT(this)); + icon, this); /*int id=*/m_buttons.insert(lastbtn, bi); KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn); tab->installEventFilter(this); - connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int))); + connect(tab,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(showHidePage(int))); // Set Whats This help // This uses the comments in the .desktop files @@ -853,9 +853,9 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { if ( kapp->authorize( "action/konqsidebarmenu" ) ) { - if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) + if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) { - KMultiTabBarTab *bt=tqt_dynamic_cast<KMultiTabBarTab*>(obj); + KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj); if (bt) { kdDebug()<<"Request for popup"<<endl; @@ -882,8 +882,8 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3); m_buttonPopup->insertSeparator(); m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4); - connect(m_buttonPopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(buttonPopupActivate(int))); + connect(m_buttonPopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(buttonPopupActivate(int))); } m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty()); m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName), @@ -902,7 +902,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev) { if ( kapp->authorize( "action/konqsidebarmenu" ) ) { - if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) { + if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) { m_menu->exec(TQCursor::pos()); } } @@ -961,11 +961,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data) KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/); data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom); connectModule(data->module); - connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)), - data->module, TQT_SLOT(openPreview(const KFileItemList&))); + connect(this, TQ_SIGNAL(fileSelection(const KFileItemList&)), + data->module, TQ_SLOT(openPreview(const KFileItemList&))); - connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)), - data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&))); + connect(this, TQ_SIGNAL(fileMouseOver(const KFileItem&)), + data->module, TQ_SLOT(openPreviewOnMouseOver(const KFileItem&))); } delete confFile; @@ -998,14 +998,14 @@ void Sidebar_Widget::showHidePage(int page) m_buttonBar->setTab(page,true); connect(info->module, - TQT_SIGNAL(setIcon(const TQString&)), + TQ_SIGNAL(setIcon(const TQString&)), m_buttonBar->tab(page), - TQT_SLOT(setIcon(const TQString&))); + TQ_SLOT(setIcon(const TQString&))); connect(info->module, - TQT_SIGNAL(setCaption(const TQString&)), + TQ_SIGNAL(setCaption(const TQString&)), m_buttonBar->tab(page), - TQT_SLOT(setText(const TQString&))); + TQ_SLOT(setText(const TQString&))); if (m_singleWidgetMode) { @@ -1144,7 +1144,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar void Sidebar_Widget::enableAction( const char * name, bool enabled ) { - if (TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo")) + if (sender()->parent()->isA("ButtonInfo")) { ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent()); if (btninfo) @@ -1169,7 +1169,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled ) bool Sidebar_Widget::doEnableActions() { - if (!(TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo"))) + if (!(sender()->parent()->isA("ButtonInfo"))) { kdDebug()<<"Couldn't set active module, aborting"<<endl; return false; @@ -1217,51 +1217,51 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) { - connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*))); + connect(mod,TQ_SIGNAL(started(TDEIO::Job *)),this, TQ_SIGNAL(started(TDEIO::Job*))); } if (mod->metaObject()->findSignal("completed()") != -1) { - connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); + connect(mod,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed())); } - if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, - const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { + connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, + const TQString &, mode_t)),this,TQ_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, + if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) { + connect(mod,TQ_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, - TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, + TQ_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { + connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(mod,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->metaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { + if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { connect(mod, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); + TQ_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { - connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), - this,TQT_SLOT(enableAction(const char *, bool))); + connect(mod,TQ_SIGNAL(enableAction( const char *, bool)), + this,TQ_SLOT(enableAction(const char *, bool))); } if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(mod,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } } @@ -1323,7 +1323,7 @@ TQSplitter *Sidebar_Widget::splitter() const TQObject *p = parent(); if (!p) return 0; p = p->parent(); - return static_cast<TQSplitter*>(TQT_TQWIDGET(p)); + return static_cast<TQSplitter*>(p); } void Sidebar_Widget::userMovedSplitter() diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index b45f79b7c..391db5101 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -38,7 +38,7 @@ class TQStringList; class ButtonInfo: public TQObject, public KonqSidebarIface { - Q_OBJECT + TQ_OBJECT public: ButtonInfo(const TQString& file_, class KonqSidebarIface *part, class KDockWidget *dock_, const TQString &url_,const TQString &lib, @@ -72,7 +72,7 @@ public: class addBackEnd: public TQObject { - Q_OBJECT + TQ_OBJECT public: addBackEnd(TQWidget *parent,class TQPopupMenu *addmenu, bool universal, const TQString ¤tProfile, const char *name=0); @@ -95,7 +95,7 @@ private: class KDE_EXPORT Sidebar_Widget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: friend class ButtonInfo; public: diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h index c5abab26c..286415557 100644 --- a/konqueror/sidebar/test/konqsidebartest.h +++ b/konqueror/sidebar/test/konqsidebartest.h @@ -22,7 +22,7 @@ class SidebarTest : public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: SidebarTest(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name) diff --git a/konqueror/sidebar/test/test.desktop b/konqueror/sidebar/test/test.desktop index e6803d320..c8061e631 100644 --- a/konqueror/sidebar/test/test.desktop +++ b/konqueror/sidebar/test/test.desktop @@ -3,66 +3,6 @@ Type=Link URL= Icon=wizard Name=Test -Name[af]=Toets -Name[ar]=إختبار -Name[az]=Sınaq -Name[be]=Праверка -Name[bg]=Проба -Name[bn]=পরীক্ষা -Name[br]=Arnodiñ -Name[bs]=Proba -Name[ca]=Prova -Name[cy]=Arbrofi -Name[el]=Δοκιμή -Name[eo]=Testo -Name[es]=Prueba -Name[eu]=Froga -Name[fa]=آزمون -Name[fi]=Testi -Name[ga]=Tástáil -Name[gl]=Probar -Name[he]=ניסיון -Name[hi]=जांच -Name[hu]=Próba -Name[id]=Tes -Name[is]=Prufa -Name[it]=Prova -Name[ja]=テスト -Name[ka]=ტესტი -Name[kk]=Сынау -Name[km]=សាកល្បង -Name[ko]=시험 -Name[lo]=ທົດສອບ -Name[lt]=Testas -Name[lv]=Tests -Name[mk]=Тест -Name[mn]=Тест -Name[ms]=Uji -Name[ne]=परीक्षण -Name[nso]=Teko -Name[pa]=ਜਾਂਚ -Name[pt]=Teste -Name[pt_BR]=Testar -Name[ru]=Тест -Name[rw]=Isuzuma -Name[se]=Geahččaleapmi -Name[sl]=Preizkus -Name[sr]=Тест -Name[ta]=சோதனை -Name[te]=పరీక్ష -Name[tg]=Озмоиш -Name[th]=ทดสอบ -Name[tt]=Sınaw -Name[uk]=Тест -Name[uz]=Sinov -Name[uz@cyrillic]=Синов -Name[ven]=Mulingo -Name[vi]=Thử -Name[wa]=Sayî -Name[xh]=Uvavanyo -Name[zh_CN]=测试 -Name[zh_TW]=測試 -Name[zu]=Isivivinyo Open=false X-TDE-KonqSidebarModule=konq_sidebartest diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 208fe2ee6..f1dd0b953 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -45,39 +45,39 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr formats << "text/uri-list" << "application/x-xbel" << "text/plain"; tree()->setDropFormats(formats); - connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); - connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(expanded(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(collapsed(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); m_collection = new TDEActionCollection( this, "bookmark actions" ); (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this, - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); + TQ_SLOT( slotDelete() ), m_collection, "delete_bookmark"); (void) new TDEAction( i18n("Properties"), "edit", 0, this, - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); + TQ_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); - KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ), + KStdAction::editBookmarks( KonqBookmarkManager::self(), TQ_SLOT( slotEditBookmarks() ), m_collection, "edit_bookmarks" ); - connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( KonqBookmarkManager::self(), TQ_SIGNAL(changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule() diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h index ba78a2b96..b39a48601 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h @@ -34,7 +34,7 @@ class KLineEdit; */ class KonqSidebarBookmarkModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: KonqSidebarBookmarkModule( KonqSidebarTree * parentTree ); virtual ~KonqSidebarBookmarkModule(); @@ -77,7 +77,7 @@ private: class BookmarkEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: BookmarkEditDialog( const TQString& title, const TQString& url, diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index b1b6d0563..e6e4a0af3 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -52,8 +52,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule() // KDirLister may still emit canceled while being deleted. if (m_dirLister) { - disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); + disconnect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); delete m_dirLister; } } @@ -303,18 +303,18 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) // mimetypes<<TQString("inode/directory"); // m_dirLister->setMimeFilter(mimetypes); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h index 89b5dcbaf..ccc607a79 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h @@ -33,7 +33,7 @@ class KonqPropsView; class KonqSidebarDirTreeModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: KonqSidebarDirTreeModule( KonqSidebarTree * parentTree, bool ); virtual ~KonqSidebarDirTreeModule(); diff --git a/konqueror/sidebar/trees/history_module/CMakeLists.txt b/konqueror/sidebar/trees/history_module/CMakeLists.txt index 799342ee8..dae047015 100644 --- a/konqueror/sidebar/trees/history_module/CMakeLists.txt +++ b/konqueror/sidebar/trees/history_module/CMakeLists.txt @@ -25,7 +25,10 @@ link_directories( ##### other data ################################ -install( FILES kcmhistory.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kcmhistory.desktop + PO_DIR konqueror-desktops +) ##### konq_sidebartree_history (module) ######### diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index 44389702e..4825cfeda 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -132,18 +132,18 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, TQDateTime current = TQDateTime::currentDateTime(); if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) - dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan )); + dt = current.addDays( - s_settings->m_valueYoungerThan ); else - dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueYoungerThan * 60) )); + dt = current.addSecs( - (s_settings->m_valueYoungerThan * 60) ); if ( m_entry->lastVisited > dt ) p->setFont( s_settings->m_fontYoungerThan ); else { if ( s_settings->m_metricOlderThan == KonqSidebarHistorySettings::DAYS ) - dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueOlderThan )); + dt = current.addDays( - s_settings->m_valueOlderThan ); else - dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueOlderThan * 60) )); + dt = current.addSecs( - (s_settings->m_valueOlderThan * 60) ); if ( m_entry->lastVisited < dt ) p->setFont( s_settings->m_fontOlderThan ); diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 6f051a553..416054cf1 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -51,7 +51,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree s_settings->readSettings( true ); } - connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); + connect( s_settings, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); m_currentTime = TQDateTime::currentDateTime(); @@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree KonqHistoryManager *manager = KonqHistoryManager::kself(); - connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() )); - connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() )); + connect( manager, TQ_SIGNAL( loadingFinished() ), TQ_SLOT( slotCreateItems() )); + connect( manager, TQ_SIGNAL( cleared() ), TQ_SLOT( clear() )); - connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), - TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); - connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), - TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); + connect( manager, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), + TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); + connect( manager, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), + TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); - connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), - TQT_SLOT( slotItemExpanded( TQListViewItem * ))); + connect( parentTree, TQ_SIGNAL( expanded( TQListViewItem * )), + TQ_SLOT( slotItemExpanded( TQListViewItem * ))); m_collection = new TDEActionCollection( this, "history actions" ); (void) new TDEAction( i18n("New &Window"), "window-new", 0, this, - TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); + TQ_SLOT( slotNewWindow() ), m_collection, "open_new"); (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this, - TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); + TQ_SLOT( slotRemoveEntry() ), m_collection, "remove"); (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this, - TQT_SLOT( slotClearHistory() ), m_collection, "clear"); + TQ_SLOT( slotClearHistory() ), m_collection, "clear"); (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this, - TQT_SLOT( slotPreferences()), m_collection, "preferences"); + TQ_SLOT( slotPreferences()), m_collection, "preferences"); TDERadioAction *sort; sort = new TDERadioAction( i18n("By &Name"), 0, this, - TQT_SLOT( slotSortByName() ), m_collection, "byName"); + TQ_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); sort = new TDERadioAction( i18n("By &Date"), 0, this, - TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); + TQ_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index 933097455..649f68150 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -38,7 +38,7 @@ class KonqSidebarTreeItem; class KonqSidebarHistoryModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: enum { diff --git a/konqueror/sidebar/trees/history_module/history_settings.h b/konqueror/sidebar/trees/history_module/history_settings.h index 7b7d75006..f4bdebe70 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.h +++ b/konqueror/sidebar/trees/history_module/history_settings.h @@ -28,7 +28,7 @@ class KonqSidebarHistorySettings : public TQObject, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: enum { MINUTES, DAYS }; diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 70e42e113..188da9d93 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, dialog->comboOlder->insertItem( i18n("Days"), KonqSidebarHistorySettings::DAYS ); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - dialog->spinExpire, TQT_SLOT( setEnabled( bool ))); - connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )), - this, TQT_SLOT( slotExpireChanged( int ))); - - connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotNewerChanged( int ))); - connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotOlderChanged( int ))); - - connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontNewer() )); - connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontOlder() )); - connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotClearHistory() )); - - connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboNewer, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboOlder, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + dialog->spinExpire, TQ_SLOT( setEnabled( bool ))); + connect( dialog->spinExpire, TQ_SIGNAL( valueChanged( int )), + this, TQ_SLOT( slotExpireChanged( int ))); + + connect( dialog->spinNewer, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotNewerChanged( int ))); + connect( dialog->spinOlder, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotOlderChanged( int ))); + + connect( dialog->btnFontNewer, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontNewer() )); + connect( dialog->btnFontOlder, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontOlder() )); + connect( dialog->btnClearHistory, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotClearHistory() )); + + connect( dialog->cbDetailedTips, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->spinEntries, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboNewer, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboOlder, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); dialog->show(); topLayout->add(dialog); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.desktop b/konqueror/sidebar/trees/history_module/kcmhistory.desktop index 17905c8ba..b7270d537 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.desktop +++ b/konqueror/sidebar/trees/history_module/kcmhistory.desktop @@ -8,229 +8,9 @@ X-TDE-Library=history X-TDE-FactoryName=history Name=History Sidebar -Name[af]=Geskiedenis Kantbalk -Name[ar]=الشريط الجانبي للخط الزمني -Name[az]=Keçmiş Yan Çubuğu -Name[be]=Бакавая панэль гісторыі -Name[bg]=История -Name[bn]=ইতিহাস সাইডবার -Name[bs]=Historija sidebar -Name[ca]=Barra de l'historial -Name[cs]=Panel historie -Name[csb]=Bòcznô lëstew historëji -Name[cy]=Cwpwrdd Cornel Hanes -Name[da]=Historik-sidebjælke -Name[de]=Verlaufsspeicher -Name[el]=Πλευρική μπάρα ιστορικού -Name[eo]=Historia flankzono -Name[es]=Barra de historial -Name[et]=Ajaloo külgriba -Name[eu]=Historiaren alboko barra -Name[fa]=میله جانبی تاریخچه -Name[fi]=Historiasivupalkki -Name[fr]=Barre latérale d'historique -Name[fy]=Histoarje -Name[ga]=Barra Taoibh Staire -Name[gl]=Barra Lateral co Historial -Name[he]=סרגל היסטוריה -Name[hi]=इतिहास बाज़ूपट्टी -Name[hr]=Traka povijesti -Name[hu]=Napló-oldalsáv -Name[is]=Sögu hliðarslá -Name[it]=Barra laterale cronologia -Name[ja]=履歴サイドバー -Name[ka]=ისტორიის გვერდითი პანელი -Name[kk]=Бүйірдегі журнал панелі -Name[km]=របារប្រវត្តិ -Name[ko]=과거 기록 사이드바 -Name[lo]=ປະວັດການໃໍຊ້ງານ -Name[lt]=Istorijos šoninė juosta -Name[lv]=Vēstures sānjosla -Name[mk]=Лента за историја -Name[mn]=Түүхийн хуудас -Name[ms]=Bar Sisi Sejarah -Name[mt]=Kronoloġija -Name[nb]=Historie-sidestolpe -Name[nds]=Vörgeschicht-Sietpaneel -Name[ne]=इतिहास छेउपट्टी -Name[nl]=Geschiedenis -Name[nn]=Historie-sidestolpe -Name[nso]=Bar ya lehlakori ya Histori -Name[pa]=ਅਤੀਤ ਪਾਸੇ ਪੱਟੀ -Name[pl]=Pasek boczny z historią -Name[pt]=Barra Lateral do Histórico -Name[pt_BR]=Barra Lateral de Histórico -Name[ro]=Bară laterală de istoric -Name[ru]=Журнал -Name[rw]=Umurongokuruhande w'Amateka -Name[se]=Historihkkaholga -Name[sk]=Bočný panel histórie -Name[sl]=Stranska vrstica zgodovine -Name[sr]=Бочни панел историјата -Name[sr@Latn]=Bočni panel istorijata -Name[sv]=Historiksidopanel -Name[ta]=வரலாற்றுப் பக்கப்பட்டி -Name[tg]=Паҳлӯи сафҳаи торихча -Name[th]=แถบประวัติการใช้ด้านข้าง -Name[tr]=Geçmiş Yan Çubuğu -Name[tt]=Taríx Yantiräse -Name[uk]=Бічна панель історії -Name[uz]=Tarix paneli -Name[uz@cyrillic]=Тарих панели -Name[ven]=Bara ya lurumbu ya Divhazwakale -Name[vi]=Bảng Lịch sử -Name[wa]=Bår di costé di l' istwere -Name[xh]=Ibar esecaleni Yembali -Name[zh_CN]=历史侧边栏 -Name[zh_TW]=歷史紀錄邊列 -Name[zu]=Umlando webha yaseceleni Comment=Configure the history sidebar -Comment[af]=Stel die geskiedenis kantbalk op -Comment[ar]=إعداد الشريط الجانبي للخط الزمني -Comment[az]=Keçmiş yan çubuğunu quraşdır -Comment[be]=Настаўленне бакавой панэлі гісторыі -Comment[bg]=Настройване на историята -Comment[bn]=ইতিহাস সাইডবার কনফিগার করুন -Comment[bs]=Ovdje možete podesiti history sidebar -Comment[ca]=Configura la barra de l'historial -Comment[cs]=Nastavení panelu historie -Comment[csb]=Kònfigùracëjô bòczny lëstwë historëji -Comment[cy]=Ffurfweddu'r cwpwrdd cornel hanes -Comment[da]=Indstil historik-sidebjælken -Comment[de]=Verlaufsanzeige im Navigationsbereich einrichten -Comment[el]=Ρυθμίστε την πλευρική μπάρα ιστορικού -Comment[eo]=Agordo de la historia flankzono -Comment[es]=Configuración de la barra del historial -Comment[et]=Ajaloo külgriba seadistamine -Comment[eu]=Konfiguratu historiaren alboko barra -Comment[fa]=پیکربندی میله جانبی تاریخچه -Comment[fi]=Historiasivupalkin asetukset -Comment[fr]=Configuration de l'historique de la barre latérale -Comment[fy]=Hjir kinne jo de histoarje ynstelle -Comment[ga]=Cumraigh an barra taoibh staire -Comment[gl]=Configurar o historial da barra lateral -Comment[he]=שינוי הגדרות הסרגל הצדדי של ההיסטוריה -Comment[hi]=इतिहास बाज़ूपट्टी कॉन्फ़िगर करें -Comment[hr]=Konfiguriranje trake povijesti -Comment[hu]=A napló-oldalsáv beállításai -Comment[is]=Stilla hliðardálk með flakksögu -Comment[it]=Configura la barra laterale della cronologia -Comment[ja]=履歴サイドバーの設定 -Comment[ka]=ისტორიის გვერდითი პანელის კონფიგურირება -Comment[kk]=Бүйірдегі журнал панелін баптау -Comment[km]=កំណត់រចនាសម្ព័ន្ធរបារប្រវត្តិ -Comment[ko]=과거 기록 사이드바를 설정합니다 -Comment[lo]=ທ່ານສາມາດປັບແຕ່ງຖາດພາເນລແຖບຫນ້າຕ່າງງານ ໄດ້ທີ່ນີ້ -Comment[lt]=Konfigūruoti istorijos šoninę juostą -Comment[lv]=Šeit jūs varat konfigurēt vēstures sānjoslu -Comment[mk]=Конфигурација на лентата за историја -Comment[mn]=Түүхийн хуудас тохируулах -Comment[ms]=Konfigur bar sisi sejarah -Comment[mt]=Ikkonfigura l-wirja tal-kronoloġija -Comment[nb]=Tilpass historiesidestolpen -Comment[nds]=Dat Vörgeschicht-Sietpaneel instellen -Comment[ne]=इतिहास छेउपट्टी कन्फिगर गर्नुहोस् -Comment[nl]=Hier kunt u de geschiedenis instellen -Comment[nn]=Set opp historie-sidestolpen -Comment[nso]=Beakanya bar ya lehlakori ya histori -Comment[pa]=ਅਤੀਤ ਬਾਹੀ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja paska bocznego z historią -Comment[pt]=Configuração da barra lateral do histórico -Comment[pt_BR]=Configura a barra lateral de Histórico -Comment[ro]=Configurează bara laterală de URL-uri vizitate -Comment[ru]=Настройка боковой панели журнала -Comment[rw]=Kuboneza umurongokuruhande w'amateka -Comment[se]=Heivet historihkkaholgga -Comment[sk]=Nastavenie bočného panelu histórie -Comment[sl]=Nastavitve stranske vrstice zgodovine -Comment[sr]=Подешавање бочног панела историјата -Comment[sr@Latn]=Podešavanje bočnog panela istorijata -Comment[sv]=Anpassa historiksidopanelen -Comment[ta]=வரலாறு பக்கப்பட்டியலை வடிவமை -Comment[tg]=Танзимоти паҳлӯи сафҳаи торихча -Comment[th]=ปรับแต่งแถบประวัติการใช้ด้านข้าง -Comment[tr]=Geçmiş yan çubuğunu yapılandır -Comment[tt]="Uzğanı" yantiräseneñ caylawı -Comment[uk]=Налаштування бічної панелі історії -Comment[uz]=Tarix panelini moslash -Comment[uz@cyrillic]=Тарих панелини мослаш -Comment[ven]=Dzudzanyani bara ya lurumbu lwa divhazwakale -Comment[vi]=Cấu hình bảng nằm bên cạnh chứa lịch sử duyệt mạng -Comment[wa]=Apontyî l' dujhance del bår di costé d' istwere -Comment[xh]=Qwalasela imbali ye bar yasecaleni -Comment[zh_CN]=配置任务侧边栏 -Comment[zh_TW]=設定歷史紀錄邊列 -Comment[zu]=Hlanganisela ibha yaseceleni yomlando Keywords=history;expire; -Keywords[ar]=الخط الزمني; إنتهاء الأجل; -Keywords[az]=history;expire;keçmiş; -Keywords[be]=Гісторыя;Састарэлая;history;expire; -Keywords[bg]=история; сърфиране; срок; изтичане; history; expire; -Keywords[ca]=historial;expira; -Keywords[cs]=historie;vypršení; -Keywords[csb]=historëjô;wëgasëwanié; -Keywords[cy]=hanes;daw i ben; -Keywords[da]=historik;udløbe; -Keywords[de]=History;Verlauf; -Keywords[el]=ιστορικό;λήξη; -Keywords[eo]=historio;malvalidiĝi; -Keywords[es]=historial;expirar; -Keywords[et]=ajalugu;aegumine; -Keywords[eu]=historia;iraungi; -Keywords[fa]=تاریخچه، انقضا; -Keywords[fi]=historia;umpeenmeno; -Keywords[fr]=historique;expiration; -Keywords[fy]=histoarje;ferrinne; -Keywords[ga]=stair;caite;as feidhm; -Keywords[gl]=historial;caducar; -Keywords[he]=היסטוריה;תפוגה;history;expire; -Keywords[hi]=इतिहास;बीत गया; -Keywords[hr]=history;expire;povijest;istek; -Keywords[hu]=napló;lejárás; -Keywords[is]=Saga;útrunnið;history; -Keywords[it]=cronologia;scadenza; -Keywords[ja]=履歴;失効; -Keywords[km]=ប្រវត្តិ ផុតកំណត់; -Keywords[lo]=ໃຊ້ຮ່ວມກັນ; -Keywords[lt]=history;expire; istorija;pasibaigti; -Keywords[lv]=vēsture;beigties; -Keywords[mk]=history;expire;историја;истекува; -Keywords[mn]=Түүх;Дуусах; -Keywords[ms]=sejarah; luput; -Keywords[mt]=history;expire;kronoloġija;skadi; -Keywords[nb]=historie;utløper; -Keywords[nds]=Vörgeschicht;aflopen; -Keywords[ne]=इतिहास; म्याद समाप्त; -Keywords[nl]=geschiedenis;verloop; -Keywords[nn]=historie;utgår; -Keywords[nso]=histori;felelwa ke nako; -Keywords[pa]=expire;ਅਤੀਤ; -Keywords[pl]=historia;wygasanie; -Keywords[pt]=histórico;expirar; -Keywords[pt_BR]=histórico;expirar; -Keywords[ro]=istoric;expirare; -Keywords[ru]=history;expire;журнал; -Keywords[rw]=amateka;kurangiza igihe; -Keywords[se]=historihkka;boarásnuvvat; -Keywords[sk]=história;vypršanie; -Keywords[sl]=zgodovina;potek;poteče; -Keywords[sr]=history;expire;историјат;истицање; -Keywords[sr@Latn]=history;expire;istorijat;isticanje; -Keywords[sv]=historik;utgå; -Keywords[ta]=வரலாறு;முடிந்தது; -Keywords[th]=ประวัติการใช้;หมดอายุ; -Keywords[tr]=geçmiş; -Keywords[uk]=історія;закінчення терміну;втрата чинності; -Keywords[uz]=tarix;muddati oʻtish; -Keywords[uz@cyrillic]=тарих;муддати ўтиш; -Keywords[ven]=divhazwakale;fhelelwa nga tshifhinga; -Keywords[vi]=lịch sử;hết hạn; -Keywords[wa]=istwere;espirer;espiraedje; -Keywords[xh]=imbali;ephelelwa lixesha; -Keywords[zh_CN]=history;expire;历史;过期; -Keywords[zh_TW]=history;expire;歷史紀錄;過期; -Keywords[zu]=umlando;ukuphelelwa isikhathi; Categories=Qt;TDE;X-TDE-settings-webbrowsing; diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h index ac82cdd60..215b78027 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.h +++ b/konqueror/sidebar/trees/history_module/kcmhistory.h @@ -29,7 +29,7 @@ class KonqSidebarHistoryDlg; class HistorySidebarConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: HistorySidebarConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() ); diff --git a/konqueror/sidebar/trees/init/CMakeLists.txt b/konqueror/sidebar/trees/init/CMakeLists.txt index bf320041b..ebcc7da06 100644 --- a/konqueror/sidebar/trees/init/CMakeLists.txt +++ b/konqueror/sidebar/trees/init/CMakeLists.txt @@ -15,20 +15,35 @@ add_subdirectory( services ) ##### other data ################################ -install( FILES +tde_create_translated_desktop( + SOURCE home.desktop root.desktop history.desktop bookmarks.desktop services.desktop remote.desktop system.desktop trash.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries ) + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries + PO_DIR konqueror-desktops +) -install( FILES - home.desktop root.desktop history.desktop bookmarks.desktop - services.desktop remote.desktop trash.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/kicker_entries ) +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/home.desktop + ${CMAKE_CURRENT_BINARY_DIR}/root.desktop + ${CMAKE_CURRENT_BINARY_DIR}/history.desktop + ${CMAKE_CURRENT_BINARY_DIR}/bookmarks.desktop + ${CMAKE_CURRENT_BINARY_DIR}/services.desktop + ${CMAKE_CURRENT_BINARY_DIR}/remote.desktop + ${CMAKE_CURRENT_BINARY_DIR}/trash.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/kicker_entries +) -install( FILES - virtualfolderadd.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add ) +tde_create_translated_desktop( + SOURCE virtualfolderadd.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add + PO_DIR konqueror-desktops +) -install( FILES +tde_create_translated_desktop( + SOURCE history_module.desktop dirtree_module.desktop bookmarks_module.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/dirtree ) + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/dirtree + PO_DIR konqueror-desktops +) diff --git a/konqueror/sidebar/trees/init/bookmarks.desktop b/konqueror/sidebar/trees/init/bookmarks.desktop index 60d0b047d..d9859ebc4 100644 --- a/konqueror/sidebar/trees/init/bookmarks.desktop +++ b/konqueror/sidebar/trees/init/bookmarks.desktop @@ -2,163 +2,11 @@ Type=Link URL= Icon=bookmark + Name=Bookmarks -Name[af]=Boekmerke -Name[ar]=علامات المواقع -Name[az]=Nişanlar -Name[be]=Закладкі -Name[bg]=Отметки -Name[bn]=বুকমার্ক -Name[br]=Sinedoù -Name[bs]=Zabilješke -Name[ca]=Punts -Name[cs]=Záložky -Name[csb]=Załóżczi -Name[cy]=Nodau Tudalen -Name[da]=Bogmærker -Name[de]=Lesezeichen -Name[el]=Σελιδοδείκτες -Name[eo]=Legosignoj -Name[es]=Marcadores -Name[et]=Järjehoidjad -Name[eu]=Laster-markak -Name[fa]=چوب الفها -Name[fi]=Kirjanmerkit -Name[fr]=Signets -Name[fy]=Blêdwizers -Name[ga]=Leabharmharcanna -Name[gl]=Marcadores -Name[he]=סימניות -Name[hi]= पसंदीदा -Name[hr]=Oznake -Name[hu]=Könyvjelzők -Name[id]=Bookmark -Name[is]=Bókamerki -Name[it]=Segnalibri -Name[ja]=ブックマーク -Name[ka]=სანიშნეები -Name[kk]=Бетбелгі -Name[km]=ចំណាំ -Name[ko]=책갈피 -Name[lo]=ທີ່ຄັ້ນປື້ມ -Name[lt]=Žymelės -Name[lv]=Grāmatzīmes -Name[mk]=Обележувачи -Name[mn]=Хавчуурга -Name[ms]=Tanda Buku -Name[mt]=Favoriti -Name[nb]=Bokmerker -Name[nds]=Leesteken -Name[ne]=पुस्तकचिनो -Name[nl]=Bladwijzers -Name[nn]=Bokmerke -Name[nso]=Ditshwao tsa Buka -Name[pa]=ਬੁੱਕਮਾਰਕ -Name[pl]=Zakładki -Name[pt]=Favoritos -Name[pt_BR]=Favoritos -Name[ro]=Semne de carte -Name[ru]=Закладки -Name[rw]=Utumenyetso -Name[se]=Girjemearkkat -Name[sk]=Záložky -Name[sl]=Zaznamki -Name[sr]=Маркери -Name[sr@Latn]=Markeri -Name[sv]=Bokmärken -Name[ta]=புத்தகக்குறிகள் -Name[te]=పేజి గుర్తులు -Name[tg]=Гузориш -Name[th]=ที่คั่นหน้า -Name[tr]=Yer imleri -Name[tt]=Bitbilge -Name[uk]=Закладки -Name[uz]=Xatchoʻplar -Name[uz@cyrillic]=Хатчўплар -Name[ven]=Dzitswayo dza bugu -Name[vi]=Sổ lưu địa chỉ -Name[wa]=Rimåkes -Name[xh]=Amanqaku eencwadi -Name[zh_CN]=书签 -Name[zh_TW]=書籤 -Name[zu]=Omaka bencwadi + Comment=This is the list of your bookmarks, for a faster access -Comment[af]=Hierdie is die lys van jou boekmerke, vir 'n vinniger toegang verkry -Comment[ar]=هذه قائمة بمواقعك المفضلة من أجل وصول أسرع -Comment[az]=Bunlar daha asan yetişmək üçün toplanan nişanlarınızdır -Comment[be]=Гэта спіс вашых закладак для хуткага доступу -Comment[bg]=Списък на отметки за бърз достъп -Comment[bn]=আপনার বুকমার্কের তালিকা, পছন্দের গন্তব্যে চটপট পৌঁছে যাবার জন্য -Comment[bs]=Ovo je lista vaših zabiljeških, za brži pristup -Comment[ca]=Aquesta és la llista dels vostres punts, per un accés més ràpid -Comment[cs]=Toto je seznam vašich záložek k jejich rychlejšímu nalezení -Comment[csb]=To je lësta załóżków, dlô chùtczégò przistãpù -Comment[cy]=Dyma restr eich nodau tudalen, am gyrchiad cyflymach -Comment[da]=Dette er en liste af dine bogmærker for hurtigere adgang -Comment[de]=Dies ist eine Liste Ihrer Lesezeichen, sie dient dem schnelleren Zugriff -Comment[el]=Αυτή είναι η λίστα των σελιδοδεικτών σας, για γρηγορότερη πρόσβαση -Comment[eo]=Jen la listo de viaj legosignoj por pli rapida aliro -Comment[es]=Esta es la lista de sus marcadores, para un acceso más rápido. -Comment[et]=Sinu järjehoidjate nimekiri -Comment[eu]=Hemen duzu zure laster-marken zerrenda, atzitze bizkorragorako -Comment[fa]=این فهرست چوب الفهای شما، برای دستیابی سریعتر است -Comment[fi]=Tämä on lista kirjanmerkeistäsi -Comment[fr]=Voici la liste de vos signets, afin que vous y accédiez plus rapidement -Comment[fy]=Dit is de list mei jo blêdwizers, foar fluggere tagong -Comment[ga]=Seo liosta do chuid leabharmharcanna, le haghaidh rochtain níos tapúla -Comment[gl]=Ésta é a lista dos seus marcadores, para un aceso máis rápido -Comment[he]=זוהי רשימת הסימניות שלך, לגישה מהירה -Comment[hi]=यह आपकी पसंद की सूची है, तेजी से पहुँच के लिए -Comment[hr]=Popis oznaka koje ubrzavaju pristup -Comment[hu]=A könyvjelzők listája (gyors elérhetőség) -Comment[is]=Hér eru bókamerkin þín -Comment[it]=Questa è la lista dei tuoi segnalibri, per un accesso più rapido -Comment[ja]=高速アクセスのためのブックマークのリストです -Comment[ka]=ეს არის თვენი სანიშნეების სია, რომელიც გჭირდებათ სწრაფად წვდომისთვის -Comment[kk]=Тез ақтару үшін бетбелгі тізіміңіз -Comment[km]=នេះជាបញ្ជីចំណាំរបស់អ្នក ដែលអាចចូលដំណើរការបានលឿន -Comment[ko]=빠른 접근을 위한 책갈피 목록입니다 -Comment[lo]=ນີ້ເປັນລາຍການທີ່ຄັ້ນປື້ມຂອງທ່ານ ເພື່ການຮງກໃຊ້ຢ່າງໄວร็ว -Comment[lt]=Šiame aplanke yra visos Jūsų žymelės, skirtos greitesniam priėjimui -Comment[lv]=Šis ir jūsu grāmatzīmju saraksts ātrākai pieejai -Comment[mk]=Ова е листа на вашите обележувачи што служат за побрз пристап -Comment[mn]=Энэ бол таны хавчуургын жагсаалт ба таньд хурдан хандах боломж олгоно. -Comment[ms]=Ini ialah senarai tanda buku anda, untuk akses terpantas -Comment[mt]=Din hija lista tal-favoriti tiegħek, għal aċċess ta' malajr -Comment[nb]=Dette er en liste over bokmerkene dine, for raskere tilgang -Comment[nds]=Dat is de List vun Dien Leesteken för gauen Togriep -Comment[ne]=छिटो पहुँचका लागि यो तपाईँको पुस्तकचिनो सूची हो -Comment[nl]=Dit is de lijst met uw bladwijzers, voor snellere toegang -Comment[nn]=Dette er ei liste over bokmerka dine, for snøggare tilgang -Comment[nso]=Ye ke palo ya ditshwao tsa gago tsa buka,go tsenelo ya kapela -Comment[pa]=ਤੇਜ਼ ਖੋਲਣ ਲਈ ਇਹ ਤੁਹਾਡੇ ਬੁੱਕਮਾਰਕ ਦੀ ਸੂਚੀ ਹੈ -Comment[pl]=To jest lista zakładek, dla szybszego dostępu -Comment[pt]=Os seus favoritos, para um acesso mais rápido -Comment[pt_BR]=Esta pasta contém a sua lista dos favoritos, para o acesso mais rápido -Comment[ro]=Aceasta este lista semnelor dumneavoastră de carte -Comment[ru]=Список закладок для быстрого доступа -Comment[rw]=Uru ni urutonde rw'utumenyetso twawe, k'ukugera kwihuse -Comment[se]=Dát leat du girjemearkkat, álkibut gávdnat -Comment[sk]=Toto je zoznam vašich záložiek, pre rýchlejší prístup k nim -Comment[sl]=To je seznam vaših zaznamkov, za hitrejši dostop. -Comment[sr]=Ово је листа ваших маркера, ради лакшег приступа -Comment[sr@Latn]=Ovo je lista vaših markera, radi lakšeg pristupa -Comment[sv]=Det här är listan på dina bokmärken, för snabbare åtkomst -Comment[ta]=இந்த பட்டியல் உங்கள் புத்தக குறியீடுகளை விரைவாற் அணுகுவதற்கு. -Comment[tg]=Рӯйхати гузориш барои дастраси тез -Comment[th]=นี่เป็นรายการที่คั่นหน้าของคุณ เพื่อการเรียกใช้อย่างรวดเร็ว -Comment[tr]=Bu sizin daha hızlı erişiminiz için kısa yollarınızın bir listesidir -Comment[tt]=Tiz ireşü öçen bitbilgelär tezmäse -Comment[uk]=Це - список ваших закладок для швидкого доступу -Comment[uz]=Xatchoʻplar roʻyxati -Comment[uz@cyrillic]=Хатчўплар рўйхати -Comment[ven]=Hoyu ndi mutevhe wa tswayo dza bugu, uitele u dzhene ngau tavhanya -Comment[vi]=Đây là danh sách tất cả các địa chỉ đã lưu của bạn, giúp cho truy cập nhanh hơn -Comment[wa]=Cichal est l' djivêye di vos rmåkes, po les trover pus rade -Comment[xh]=Olu luluhlu lwamanqaku encwadi yakho, yonikezelo olukhawulezayo -Comment[zh_CN]=这是您的书签列表，以便使得访问更加方便 -Comment[zh_TW]=快速存取網站的書籤列表 -Comment[zu]=Lolu uhlu lomaka bakho bencwadi,ukuze ungene ngokushesha + Open=false X-TDE-TreeModule=Bookmarks X-TDE-SearchableTreeModule=true diff --git a/konqueror/sidebar/trees/init/bookmarks_module.desktop b/konqueror/sidebar/trees/init/bookmarks_module.desktop index c375907c6..de8d88d0b 100644 --- a/konqueror/sidebar/trees/init/bookmarks_module.desktop +++ b/konqueror/sidebar/trees/init/bookmarks_module.desktop @@ -2,163 +2,11 @@ Type=Link URL= Icon=bookmark + Name=Bookmarks -Name[af]=Boekmerke -Name[ar]=علامات المواقع -Name[az]=Nişanlar -Name[be]=Закладкі -Name[bg]=Отметки -Name[bn]=বুকমার্ক -Name[br]=Sinedoù -Name[bs]=Zabilješke -Name[ca]=Punts -Name[cs]=Záložky -Name[csb]=Załóżczi -Name[cy]=Nodau Tudalen -Name[da]=Bogmærker -Name[de]=Lesezeichen -Name[el]=Σελιδοδείκτες -Name[eo]=Legosignoj -Name[es]=Marcadores -Name[et]=Järjehoidjad -Name[eu]=Laster-markak -Name[fa]=چوب الفها -Name[fi]=Kirjanmerkit -Name[fr]=Signets -Name[fy]=Blêdwizers -Name[ga]=Leabharmharcanna -Name[gl]=Marcadores -Name[he]=סימניות -Name[hi]= पसंदीदा -Name[hr]=Oznake -Name[hu]=Könyvjelzők -Name[id]=Bookmark -Name[is]=Bókamerki -Name[it]=Segnalibri -Name[ja]=ブックマーク -Name[ka]=სანიშნეები -Name[kk]=Бетбелгі -Name[km]=ចំណាំ -Name[ko]=책갈피 -Name[lo]=ທີ່ຄັ້ນປື້ມ -Name[lt]=Žymelės -Name[lv]=Grāmatzīmes -Name[mk]=Обележувачи -Name[mn]=Хавчуурга -Name[ms]=Tanda Buku -Name[mt]=Favoriti -Name[nb]=Bokmerker -Name[nds]=Leesteken -Name[ne]=पुस्तकचिनो -Name[nl]=Bladwijzers -Name[nn]=Bokmerke -Name[nso]=Ditshwao tsa Buka -Name[pa]=ਬੁੱਕਮਾਰਕ -Name[pl]=Zakładki -Name[pt]=Favoritos -Name[pt_BR]=Favoritos -Name[ro]=Semne de carte -Name[ru]=Закладки -Name[rw]=Utumenyetso -Name[se]=Girjemearkkat -Name[sk]=Záložky -Name[sl]=Zaznamki -Name[sr]=Маркери -Name[sr@Latn]=Markeri -Name[sv]=Bokmärken -Name[ta]=புத்தகக்குறிகள் -Name[te]=పేజి గుర్తులు -Name[tg]=Гузориш -Name[th]=ที่คั่นหน้า -Name[tr]=Yer imleri -Name[tt]=Bitbilge -Name[uk]=Закладки -Name[uz]=Xatchoʻplar -Name[uz@cyrillic]=Хатчўплар -Name[ven]=Dzitswayo dza bugu -Name[vi]=Sổ lưu địa chỉ -Name[wa]=Rimåkes -Name[xh]=Amanqaku eencwadi -Name[zh_CN]=书签 -Name[zh_TW]=書籤 -Name[zu]=Omaka bencwadi + Comment=This is the list of your bookmarks, for a faster access -Comment[af]=Hierdie is die lys van jou boekmerke, vir 'n vinniger toegang verkry -Comment[ar]=هذه قائمة بمواقعك المفضلة من أجل وصول أسرع -Comment[az]=Bunlar daha asan yetişmək üçün toplanan nişanlarınızdır -Comment[be]=Гэта спіс вашых закладак для хуткага доступу -Comment[bg]=Списък на отметки за бърз достъп -Comment[bn]=আপনার বুকমার্কের তালিকা, পছন্দের গন্তব্যে চটপট পৌঁছে যাবার জন্য -Comment[bs]=Ovo je lista vaših zabiljeških, za brži pristup -Comment[ca]=Aquesta és la llista dels vostres punts, per un accés més ràpid -Comment[cs]=Toto je seznam vašich záložek k jejich rychlejšímu nalezení -Comment[csb]=To je lësta załóżków, dlô chùtczégò przistãpù -Comment[cy]=Dyma restr eich nodau tudalen, am gyrchiad cyflymach -Comment[da]=Dette er en liste af dine bogmærker for hurtigere adgang -Comment[de]=Dies ist eine Liste Ihrer Lesezeichen, sie dient dem schnelleren Zugriff -Comment[el]=Αυτή είναι η λίστα των σελιδοδεικτών σας, για γρηγορότερη πρόσβαση -Comment[eo]=Jen la listo de viaj legosignoj por pli rapida aliro -Comment[es]=Esta es la lista de sus marcadores, para un acceso más rápido. -Comment[et]=Sinu järjehoidjate nimekiri -Comment[eu]=Hemen duzu zure laster-marken zerrenda, atzitze bizkorragorako -Comment[fa]=این فهرست چوب الفهای شما، برای دستیابی سریعتر است -Comment[fi]=Tämä on lista kirjanmerkeistäsi -Comment[fr]=Voici la liste de vos signets, afin que vous y accédiez plus rapidement -Comment[fy]=Dit is de list mei jo blêdwizers, foar fluggere tagong -Comment[ga]=Seo liosta do chuid leabharmharcanna, le haghaidh rochtain níos tapúla -Comment[gl]=Ésta é a lista dos seus marcadores, para un aceso máis rápido -Comment[he]=זוהי רשימת הסימניות שלך, לגישה מהירה -Comment[hi]=यह आपकी पसंद की सूची है, तेजी से पहुँच के लिए -Comment[hr]=Popis oznaka koje ubrzavaju pristup -Comment[hu]=A könyvjelzők listája (gyors elérhetőség) -Comment[is]=Hér eru bókamerkin þín -Comment[it]=Questa è la lista dei tuoi segnalibri, per un accesso più rapido -Comment[ja]=高速アクセスのためのブックマークのリストです -Comment[ka]=ეს არის თვენი სანიშნეების სია, რომელიც გჭირდებათ სწრაფად წვდომისთვის -Comment[kk]=Тез ақтару үшін бетбелгі тізіміңіз -Comment[km]=នេះជាបញ្ជីចំណាំរបស់អ្នក ដែលអាចចូលដំណើរការបានលឿន -Comment[ko]=빠른 접근을 위한 책갈피 목록입니다 -Comment[lo]=ນີ້ເປັນລາຍການທີ່ຄັ້ນປື້ມຂອງທ່ານ ເພື່ການຮງກໃຊ້ຢ່າງໄວร็ว -Comment[lt]=Šiame aplanke yra visos Jūsų žymelės, skirtos greitesniam priėjimui -Comment[lv]=Šis ir jūsu grāmatzīmju saraksts ātrākai pieejai -Comment[mk]=Ова е листа на вашите обележувачи што служат за побрз пристап -Comment[mn]=Энэ бол таны хавчуургын жагсаалт ба таньд хурдан хандах боломж олгоно. -Comment[ms]=Ini ialah senarai tanda buku anda, untuk akses terpantas -Comment[mt]=Din hija lista tal-favoriti tiegħek, għal aċċess ta' malajr -Comment[nb]=Dette er en liste over bokmerkene dine, for raskere tilgang -Comment[nds]=Dat is de List vun Dien Leesteken för gauen Togriep -Comment[ne]=छिटो पहुँचका लागि यो तपाईँको पुस्तकचिनो सूची हो -Comment[nl]=Dit is de lijst met uw bladwijzers, voor snellere toegang -Comment[nn]=Dette er ei liste over bokmerka dine, for snøggare tilgang -Comment[nso]=Ye ke palo ya ditshwao tsa gago tsa buka,go tsenelo ya kapela -Comment[pa]=ਤੇਜ਼ ਖੋਲਣ ਲਈ ਇਹ ਤੁਹਾਡੇ ਬੁੱਕਮਾਰਕ ਦੀ ਸੂਚੀ ਹੈ -Comment[pl]=To jest lista zakładek, dla szybszego dostępu -Comment[pt]=Os seus favoritos, para um acesso mais rápido -Comment[pt_BR]=Esta pasta contém a sua lista dos favoritos, para o acesso mais rápido -Comment[ro]=Aceasta este lista semnelor dumneavoastră de carte -Comment[ru]=Список закладок для быстрого доступа -Comment[rw]=Uru ni urutonde rw'utumenyetso twawe, k'ukugera kwihuse -Comment[se]=Dát leat du girjemearkkat, álkibut gávdnat -Comment[sk]=Toto je zoznam vašich záložiek, pre rýchlejší prístup k nim -Comment[sl]=To je seznam vaših zaznamkov, za hitrejši dostop. -Comment[sr]=Ово је листа ваших маркера, ради лакшег приступа -Comment[sr@Latn]=Ovo je lista vaših markera, radi lakšeg pristupa -Comment[sv]=Det här är listan på dina bokmärken, för snabbare åtkomst -Comment[ta]=இந்த பட்டியல் உங்கள் புத்தக குறியீடுகளை விரைவாற் அணுகுவதற்கு. -Comment[tg]=Рӯйхати гузориш барои дастраси тез -Comment[th]=นี่เป็นรายการที่คั่นหน้าของคุณ เพื่อการเรียกใช้อย่างรวดเร็ว -Comment[tr]=Bu sizin daha hızlı erişiminiz için kısa yollarınızın bir listesidir -Comment[tt]=Tiz ireşü öçen bitbilgelär tezmäse -Comment[uk]=Це - список ваших закладок для швидкого доступу -Comment[uz]=Xatchoʻplar roʻyxati -Comment[uz@cyrillic]=Хатчўплар рўйхати -Comment[ven]=Hoyu ndi mutevhe wa tswayo dza bugu, uitele u dzhene ngau tavhanya -Comment[vi]=Đây là danh sách tất cả các địa chỉ đã lưu của bạn, giúp cho truy cập nhanh hơn -Comment[wa]=Cichal est l' djivêye di vos rmåkes, po les trover pus rade -Comment[xh]=Olu luluhlu lwamanqaku encwadi yakho, yonikezelo olukhawulezayo -Comment[zh_CN]=这是您的书签列表，以便使得访问更加方便 -Comment[zh_TW]=快速存取網站的書籤列表 -Comment[zu]=Lolu uhlu lomaka bakho bencwadi,ukuze ungene ngokushesha + Open=false X-TDE-TreeModule=Bookmarks X-TDE-SearchableTreeModule=true diff --git a/konqueror/sidebar/trees/init/dirtree_module.desktop b/konqueror/sidebar/trees/init/dirtree_module.desktop index 688d423d4..abcfc5165 100644 --- a/konqueror/sidebar/trees/init/dirtree_module.desktop +++ b/konqueror/sidebar/trees/init/dirtree_module.desktop @@ -3,77 +3,6 @@ Type=Link URL= Icon=folder Name=Folder -Name[af]=Gids -Name[ar]=المجلد -Name[az]=Qovluq -Name[be]=Тэчка -Name[bg]=Директория -Name[bn]=ফোল্ডার -Name[br]=Renkell -Name[bs]=Direktorij -Name[ca]=Carpeta -Name[cs]=Složka -Name[csb]=Katalog -Name[cy]=Plygell -Name[da]=Mappe -Name[de]=Ordner -Name[el]=Φάκελος -Name[eo]=Dosierujo -Name[es]=Carpeta -Name[et]=Kataloog -Name[eu]=Karpeta -Name[fa]=پوشه -Name[fi]=Kansio -Name[fr]=Dossier -Name[fy]=Map -Name[ga]=Fillteán -Name[gl]=Cartafol -Name[he]=תיקייה -Name[hi]=फ़ोल्डर -Name[hr]=Mapa -Name[hu]=Könyvtár -Name[is]=Mappa -Name[it]=Cartella -Name[ja]=フォルダ -Name[ka]=საქაღალდე -Name[kk]=Қапшық -Name[km]=ថត -Name[ko]=홈 폴더 -Name[lt]=Aplankas -Name[lv]=Mape -Name[mk]=Папка -Name[mn]=хавтас -Name[mt]=Direttorju -Name[nb]=Mappe -Name[nds]=Orner -Name[ne]=फोल्डर -Name[nl]=Map -Name[nn]=Mappe -Name[pa]=ਫੋਲਡਰ -Name[pl]=Katalog -Name[pt]=Pasta -Name[pt_BR]=Pasta -Name[ru]=Папка -Name[rw]=Ububiko -Name[se]=Máhppa -Name[sk]=Priečinok -Name[sl]=Mapa -Name[sr]=Фасцикла -Name[sr@Latn]=Fascikla -Name[sv]=Katalog -Name[ta]=அடைவு -Name[te]=ఫొల్డర్ -Name[tg]=Феҳрист -Name[th]=โฟลเดอร์ -Name[tr]=Dizin -Name[tt]=Törgäk -Name[uk]=Тека -Name[uz]=Jild -Name[uz@cyrillic]=Жилд -Name[vi]=Thư mục -Name[wa]=Ridant -Name[zh_CN]=文件夹 -Name[zh_TW]=資料夾 Open=false X-TDE-TreeModule=Directory diff --git a/konqueror/sidebar/trees/init/history.desktop b/konqueror/sidebar/trees/init/history.desktop index f7ce6a7f6..881a8cfb7 100644 --- a/konqueror/sidebar/trees/init/history.desktop +++ b/konqueror/sidebar/trees/init/history.desktop @@ -2,162 +2,11 @@ Type=Link URL= Icon=history + Name=History -Name[af]=Geskiedenis -Name[ar]=الخطّ الزمني -Name[az]=Keçmiş -Name[be]=Гісторыя -Name[bg]=История -Name[bn]=ইতিহাস -Name[br]=Istor -Name[bs]=Historija -Name[ca]=Historial -Name[cs]=Historie -Name[csb]=Historëjô -Name[cy]=Hanes -Name[da]=Historik -Name[de]=Verlaufsspeicher -Name[el]=Ιστορικό -Name[eo]=Historio -Name[es]=Historial -Name[et]=Ajalugu -Name[eu]=Historia -Name[fa]=تاریخچه -Name[fi]=Historia -Name[fr]=Historique -Name[fy]=Histoarje -Name[ga]=Stair -Name[gl]=Historial -Name[he]=היסטוריה -Name[hi]=इतिहास -Name[hr]=Povijest -Name[hu]=Napló -Name[id]=Sejarah -Name[is]=Saga -Name[it]=Cronologia -Name[ja]=履歴 -Name[ka]=ისტორია -Name[kk]=Журнал -Name[km]=ប្រវត្តិ -Name[ko]=과거 기록 -Name[lo]=ປະວັດການໃຊ້ງານ -Name[lt]=Istorija -Name[lv]=Vēsture -Name[mk]=Историја -Name[mn]=Түүх -Name[ms]=Sejarah -Name[mt]=Kronoloġija -Name[nb]=Historie -Name[nds]=Vörgeschicht -Name[ne]=इतिहास -Name[nl]=Geschiedenis -Name[nn]=Historie -Name[nso]=Histori -Name[pa]=ਅਤੀਤ -Name[pl]=Historia -Name[pt]=Histórico -Name[pt_BR]=Histórico -Name[ro]=Istoric -Name[ru]=Журнал -Name[rw]=Amateka -Name[se]=Historihkka -Name[sk]=História -Name[sl]=Zgodovina -Name[sr]=Историјат -Name[sr@Latn]=Istorijat -Name[sv]=Historik -Name[ta]=வரலாறு -Name[te]=చరిత్ర -Name[tg]=Таърих -Name[th]=ประวัติการใช้ -Name[tr]=Geçmiş -Name[tt]=Taríx -Name[uk]=Історія -Name[uz]=Tarix -Name[uz@cyrillic]=Тарих -Name[ven]=Divhazwakale -Name[vi]=Lịch sử -Name[wa]=Istwere -Name[xh]=Imbali -Name[zh_CN]=历史 -Name[zh_TW]=歷史紀錄 -Name[zu]=Umlando + Comment=This is the history of the URLs you have recently visited. You can sort them in many ways. -Comment[af]=Hierdie is die geskiedenis van die Urls jy het onlangse besoekte. jy kan sorteer hulle in veel maniere. -Comment[ar]=هذا الخط الزمني للمواقع التي زرتها حديثاً. يمكنك ترتيبها بالعديد من الطرق. -Comment[az]=Bu da əvvəllər ziyarət etdiyiniz URLlərin siyahısıdır. Onları istədiyiniz kimi düzə bilərsiiz. -Comment[be]=Гэта гісторыя спасылак URL, якія вы раней наведалі. Вы можаце ўпарадкаваць іх рознымі спосабамі. -Comment[bg]=История на скоро посетените адреси -Comment[bn]=আপনি সম্প্রতি কোন কোন ইউ-আর-এল-এ গিয়েছেন তার ইতিহাস। আপনি এই তালিকাটি নানাভাবে সাজাতে পারেন। -Comment[bs]=Ovo je historija URLova koje ste nedavno posjetili. Možete ih složiti na više načina. -Comment[ca]=Aquest és l'historial amb els URL que heu visitat recentment. Podeu ordenar-les de moltes maneres. -Comment[cs]=Toto je historie URL, které jste naposledy navštívili. Můžete si je různými způsoby setřídit. -Comment[csb]=Historëjô slédno òbzérónëch adresów URL. Je mòżno jã na wszelejaczé ôrte zortowac. -Comment[cy]=Dyma hanes y safleoedd rydych wedi ymweld a nhw. Gallwch eu didoli mewn sawl ffordd. -Comment[da]=Dette er historikken for de URL'er du har besøgt for nyligt. Du kan sortere dem på mange måder. -Comment[de]=Dies ist ein Ordner für alle Adressen, die Sie in letzter Zeit besucht haben. Sie können sie auf vielerlei Weise sortieren. -Comment[el]=Αυτό είναι το ιστορικό των URL που επισκεφθήκατε πρόσφατα. Μπορείτε να τα ταξινομήσετε με πολλούς τρόπους. -Comment[eo]=Jen la historio de la vizititaj URLoj. Vi povas ordigi ilin diversmaniere. -Comment[es]=Este es el historial con las URLs que ha visitado recientemente. Puede ordenarlas de diversos modos. -Comment[et]=Sinu viimati külastatud saitide ajalugu. Ajalugu on võimalik mitmel moel sorteerida. -Comment[eu]=Hau bisitatu berri dituzun URLen historia da. Era askotan antola ditzakezu -Comment[fa]=این تاریخچۀ نشانیهای وبی است که اخیراً بازدید کردهاید. میتوانید آنها را به روشهای زیادی مرتب کنید. -Comment[fi]=Tämä on historia selatuista verkko-osoitteista. Ne voidaan järjestää monella tavalla. -Comment[fr]=Voici la liste des URL que vous avez récemment visitées. Vous pouvez les trier de multiples façons. -Comment[fy]=Dit is de histoarje fan de URL-adressen wêr jo koartlyn west ha. Jo kinne se op ferskate manieren sortearje. -Comment[gl]=Éste é o historial de URLs que visitou recentemente. Pode ordená-las de varios xeitos. -Comment[he]=זוהי היסטוריית הכתובות בהן ביקרת לאחרונה. באפשרותך לסדר אותה במגוון דרכים. -Comment[hi]=आप जो हालिया भ्रमण किए हैं, उन यूआरएल का यह इतिहास है. आप इन्हें कई तरीकों से क्रमबद्ध कर सकते हैं. -Comment[hr]=Povijest nedavno posjećenih URL adresa koji je moguće preslagivati na različite načine -Comment[hu]=Itt láthatók a legutóbb meglátogatott URL-ek. Többféle szempont szerint is sorba rendezhetők. -Comment[is]=Þetta er saga þeirra heimasíðna sem þú hefur heimsótt. Þú getur raðað þessum lista á ýmsan hátt. -Comment[it]=Questa è la cronologia degli indirizzi URL che hai visitato recentemente. Puoi ordinarli in vari modi. -Comment[ja]=最近訪問した URL のリストを表示します。リストはさまざまな方法でソートできます。 -Comment[ka]=ეს არის იმ URL-თა სია რომელიც ბოლო დროს მოინახულეთ. თქვენ შეგიძლიათ მათი დალაგება თქვენი ნებისამებრ -Comment[kk]=Жуырда жолыққан URL адрестер. Өз ыңғайыңызға қарай реттеп алуға болады. -Comment[km]=នេះជាប្រវត្តិរបស់ URL ដែលអ្នកបានទស្សនាថ្មីៗនេះ ។ អ្នកអាចតម្រៀបពួកវាតាមវិធីជាច្រើន ។ -Comment[ko]=이것은 최근에 방문한 URL 기록입니다. 다양한 방법으로 정렬할 수 있습니다. -Comment[lo]=ນີ້ເປັນປະວັດເກັບ URL ທີ່ທ່ານເຄີຍມມກ່ອນໂດຍທ່ານສາມາດລງງລຳດັບມັນໄດ້ໃນຫລາຍຮູບແບບ -Comment[lt]=Tai Jūsų neseniai aplankytų URL istorija, Jūs galite surūšiuoti juos įvairiais būdais. -Comment[lv]=Šī ir nesen apmeklēto URL vēsture. Jūs varat to šķirot daudzos veidos. -Comment[mk]=Ова е историја на URL кои скоро сте ги посетиле. Може да ги подредувате на разни начини. -Comment[mn]= Энэ бол таны хамгийн сүүлд айлчилсан URL хаягуудын түүх юм. Та тэдгээрийг янз бүрээр эрэмбэлж болно. -Comment[ms]=Ini ialah sejarah URL yang baru anda lawati. Anda tidak boleh isihkan ia dalam banyak cara. -Comment[mt]=Din hija kronoloġija tal-URLs kollha li żort reċentement. Tista' tissortjahom b'diversi modi. -Comment[nb]=Dette er en liste over de nettadressene du har vært innom nylig. Du kan sortere dem på ulike måter. -Comment[nds]=Dit is de Vörgeschicht vun Sieden, de Du tolest besöcht hest. Du kannst se op mennige Oorden sorteren. -Comment[ne]=यो तपाईँले भर्खरै अवलोकन गर्नु भएको यूआरएलहरूको सूची हो । तीनिहरूलाई तपाईँले धेरै तरिकाले क्रमबद्ध गर्न सक्नुहुन्छ । -Comment[nl]=Dit is de geschiedenis van de URL-adressen waar u recentelijk bent geweest. U kunt ze op meerdere manieren sorteren. -Comment[nn]=Dette er historia over adressene du nyleg har vitja. Du kan sortera lista på mange måtar. -Comment[nso]=Ye ke histori ya di-URL tseo odi etetsego gabjale. Okadi rarolla ka mekgwa ye mentshi. -Comment[pa]=ਇਹ URL ਦੀ ਸੂਚੀ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਖੋਲੋ ਸਨ, ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਕਈ ਤਰਾਂ ਕ੍ਰਮਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। -Comment[pl]=Historia ostatnio odwiedzonych adresów URL. Można ją na różne sposoby posortować. -Comment[pt]=O histórico dos URLs visitados recentemente. É possível ordená-los de várias maneiras. -Comment[pt_BR]=Este é o histórico das URLs que você visitou recentemente. Você pode ordenar esta lista de várias maneiras. -Comment[ro]=Acesta este istoricul URL-urilor pe care le-ați vizitat recent. Le puteți sorta în diferite moduri. -Comment[ru]=Журнал недавно посещённых адресов (URL). Его можно настраивать по своему усмотрению. -Comment[rw]=Aya ni amateka ya URL wasuye vuba. Ushobora kuzishungura mu buryo bwinshi. -Comment[se]=Dán listtus oainnát čujuhusaid maid áiddo leat guossohan. Don sáhtát erohallat listtu máŋgga láhkai. -Comment[sk]=Toto je história URL, ktoré ste naposledy navštívili. Môžete ich utriediť rôznymi spôsobmi. -Comment[sl]=To je zgodovina URL-jev, ki ste jih pred kratkim obiskali. Lahko jih uredite na različne načine. -Comment[sr]=Ово је листа URL-ова које сте недавно посетили. Можете је поређати на разне начине. -Comment[sr@Latn]=Ovo je lista URL-ova koje ste nedavno posetili. Možete je poređati na razne načine. -Comment[sv]=Det här är historiken på de webbadresser du nyligen besökt. Du kan sortera dem på många sätt. -Comment[ta]=நீங்கள் தற்போது பார்த்த வலைப்பின்னல்களின் வரலாறு. அதை பல வழிகளில் வரிசைப்படுத்தலாம். -Comment[tg]=Ин саҳифаҳои аз торихчаи URL-ҳое ки охирон дидаед. Метавонед онҳоро ба ҳар сурати дархост мураттаб кунед. -Comment[th]=นี่เป็นประวัติเก็บ URL ที่คุณเคยไปมาก่อน โดยคุณสามารถเรียงลำดับมันได้ในหลายรูปแบบ -Comment[tr]=Bu sizim yakın geçmişte ziyaret ettiğiniz URL'lerin bir listesidir. Bunları bir çok şekilde sıralayabilirsiniz. -Comment[tt]=Soñğı arada qaralğan bulğan URL tezmäse. Anı törleçä tärtipläp bula. -Comment[uk]=Це - історія URL, які ви недавно відвідали. Ви можете також впорядкувати її будь-яким чином. -Comment[uz]=Yaqinda koʻrgan URL'larning tarixi. Ularni turlicha saralashingiz mumkin -Comment[uz@cyrillic]=Яқинда кўрган URL'ларнинг тарихи. Уларни турлича саралашингиз мумкин -Comment[ven]=Heyi ndi divhazwakale ya URL no i dalelaho zwazwino. Ni nga i lugisa nga ndila dzo fhambananho. -Comment[vi]=Đây là danh sách các URL bạn đã xem gần đây. Bạn có thể sắp xếp lại chúng theo vài cách khác nhau. -Comment[wa]=Cichal est l' istwere des URL ki vs avoz vizité enawaire. Vos les ploz arindjî di sacwantès manires. -Comment[xh]=Le yimbali yee URL obusandukuzindwendwela. Ungazibeka ngendlela ezininzi. -Comment[zh_CN]=这是您曾经浏览过的 URL 历史。您可以以多种方式对其排序。 -Comment[zh_TW]=這是您最近訪問的 URL 的歷史紀錄。您可以將它們以多種方式排序。 -Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi. + Open=false X-TDE-TreeModule=History X-TDE-SearchableTreeModule=true diff --git a/konqueror/sidebar/trees/init/history_module.desktop b/konqueror/sidebar/trees/init/history_module.desktop index 0476ff56a..19cd2e834 100644 --- a/konqueror/sidebar/trees/init/history_module.desktop +++ b/konqueror/sidebar/trees/init/history_module.desktop @@ -2,162 +2,11 @@ Type=Link URL= Icon=history + Name=History -Name[af]=Geskiedenis -Name[ar]=الخطّ الزمني -Name[az]=Keçmiş -Name[be]=Гісторыя -Name[bg]=История -Name[bn]=ইতিহাস -Name[br]=Istor -Name[bs]=Historija -Name[ca]=Historial -Name[cs]=Historie -Name[csb]=Historëjô -Name[cy]=Hanes -Name[da]=Historik -Name[de]=Verlaufsspeicher -Name[el]=Ιστορικό -Name[eo]=Historio -Name[es]=Historial -Name[et]=Ajalugu -Name[eu]=Historia -Name[fa]=تاریخچه -Name[fi]=Historia -Name[fr]=Historique -Name[fy]=Histoarje -Name[ga]=Stair -Name[gl]=Historial -Name[he]=היסטוריה -Name[hi]=इतिहास -Name[hr]=Povijest -Name[hu]=Napló -Name[id]=Sejarah -Name[is]=Saga -Name[it]=Cronologia -Name[ja]=履歴 -Name[ka]=ისტორია -Name[kk]=Журнал -Name[km]=ប្រវត្តិ -Name[ko]=과거 기록 -Name[lo]=ປະວັດການໃຊ້ງານ -Name[lt]=Istorija -Name[lv]=Vēsture -Name[mk]=Историја -Name[mn]=Түүх -Name[ms]=Sejarah -Name[mt]=Kronoloġija -Name[nb]=Historie -Name[nds]=Vörgeschicht -Name[ne]=इतिहास -Name[nl]=Geschiedenis -Name[nn]=Historie -Name[nso]=Histori -Name[pa]=ਅਤੀਤ -Name[pl]=Historia -Name[pt]=Histórico -Name[pt_BR]=Histórico -Name[ro]=Istoric -Name[ru]=Журнал -Name[rw]=Amateka -Name[se]=Historihkka -Name[sk]=História -Name[sl]=Zgodovina -Name[sr]=Историјат -Name[sr@Latn]=Istorijat -Name[sv]=Historik -Name[ta]=வரலாறு -Name[te]=చరిత్ర -Name[tg]=Таърих -Name[th]=ประวัติการใช้ -Name[tr]=Geçmiş -Name[tt]=Taríx -Name[uk]=Історія -Name[uz]=Tarix -Name[uz@cyrillic]=Тарих -Name[ven]=Divhazwakale -Name[vi]=Lịch sử -Name[wa]=Istwere -Name[xh]=Imbali -Name[zh_CN]=历史 -Name[zh_TW]=歷史紀錄 -Name[zu]=Umlando + Comment=This is the history of the URLs you have recently visited. You can sort them in many ways. -Comment[af]=Hierdie is die geskiedenis van die Urls jy het onlangse besoekte. jy kan sorteer hulle in veel maniere. -Comment[ar]=هذا الخط الزمني للمواقع التي زرتها حديثاً. يمكنك ترتيبها بالعديد من الطرق. -Comment[az]=Bu da əvvəllər ziyarət etdiyiniz URLlərin siyahısıdır. Onları istədiyiniz kimi düzə bilərsiiz. -Comment[be]=Гэта гісторыя спасылак URL, якія вы раней наведалі. Вы можаце ўпарадкаваць іх рознымі спосабамі. -Comment[bg]=История на скоро посетените адреси -Comment[bn]=আপনি সম্প্রতি কোন কোন ইউ-আর-এল-এ গিয়েছেন তার ইতিহাস। আপনি এই তালিকাটি নানাভাবে সাজাতে পারেন। -Comment[bs]=Ovo je historija URLova koje ste nedavno posjetili. Možete ih složiti na više načina. -Comment[ca]=Aquest és l'historial amb els URL que heu visitat recentment. Podeu ordenar-les de moltes maneres. -Comment[cs]=Toto je historie URL, které jste naposledy navštívili. Můžete si je různými způsoby setřídit. -Comment[csb]=Historëjô slédno òbzérónëch adresów URL. Je mòżno jã na wszelejaczé ôrte zortowac. -Comment[cy]=Dyma hanes y safleoedd rydych wedi ymweld a nhw. Gallwch eu didoli mewn sawl ffordd. -Comment[da]=Dette er historikken for de URL'er du har besøgt for nyligt. Du kan sortere dem på mange måder. -Comment[de]=Dies ist ein Ordner für alle Adressen, die Sie in letzter Zeit besucht haben. Sie können sie auf vielerlei Weise sortieren. -Comment[el]=Αυτό είναι το ιστορικό των URL που επισκεφθήκατε πρόσφατα. Μπορείτε να τα ταξινομήσετε με πολλούς τρόπους. -Comment[eo]=Jen la historio de la vizititaj URLoj. Vi povas ordigi ilin diversmaniere. -Comment[es]=Este es el historial con las URLs que ha visitado recientemente. Puede ordenarlas de diversos modos. -Comment[et]=Sinu viimati külastatud saitide ajalugu. Ajalugu on võimalik mitmel moel sorteerida. -Comment[eu]=Hau bisitatu berri dituzun URLen historia da. Era askotan antola ditzakezu -Comment[fa]=این تاریخچۀ نشانیهای وبی است که اخیراً بازدید کردهاید. میتوانید آنها را به روشهای زیادی مرتب کنید. -Comment[fi]=Tämä on historia selatuista verkko-osoitteista. Ne voidaan järjestää monella tavalla. -Comment[fr]=Voici la liste des URL que vous avez récemment visitées. Vous pouvez les trier de multiples façons. -Comment[fy]=Dit is de histoarje fan de URL-adressen wêr jo koartlyn west ha. Jo kinne se op ferskate manieren sortearje. -Comment[gl]=Éste é o historial de URLs que visitou recentemente. Pode ordená-las de varios xeitos. -Comment[he]=זוהי היסטוריית הכתובות בהן ביקרת לאחרונה. באפשרותך לסדר אותה במגוון דרכים. -Comment[hi]=आप जो हालिया भ्रमण किए हैं, उन यूआरएल का यह इतिहास है. आप इन्हें कई तरीकों से क्रमबद्ध कर सकते हैं. -Comment[hr]=Povijest nedavno posjećenih URL adresa koji je moguće preslagivati na različite načine -Comment[hu]=Itt láthatók a legutóbb meglátogatott URL-ek. Többféle szempont szerint is sorba rendezhetők. -Comment[is]=Þetta er saga þeirra heimasíðna sem þú hefur heimsótt. Þú getur raðað þessum lista á ýmsan hátt. -Comment[it]=Questa è la cronologia degli indirizzi URL che hai visitato recentemente. Puoi ordinarli in vari modi. -Comment[ja]=最近訪問した URL のリストを表示します。リストはさまざまな方法でソートできます。 -Comment[ka]=ეს არის იმ URL-თა სია რომელიც ბოლო დროს მოინახულეთ. თქვენ შეგიძლიათ მათი დალაგება თქვენი ნებისამებრ -Comment[kk]=Жуырда жолыққан URL адрестер. Өз ыңғайыңызға қарай реттеп алуға болады. -Comment[km]=នេះជាប្រវត្តិរបស់ URL ដែលអ្នកបានទស្សនាថ្មីៗនេះ ។ អ្នកអាចតម្រៀបពួកវាតាមវិធីជាច្រើន ។ -Comment[ko]=이것은 최근에 방문한 URL 기록입니다. 다양한 방법으로 정렬할 수 있습니다. -Comment[lo]=ນີ້ເປັນປະວັດເກັບ URL ທີ່ທ່ານເຄີຍມມກ່ອນໂດຍທ່ານສາມາດລງງລຳດັບມັນໄດ້ໃນຫລາຍຮູບແບບ -Comment[lt]=Tai Jūsų neseniai aplankytų URL istorija, Jūs galite surūšiuoti juos įvairiais būdais. -Comment[lv]=Šī ir nesen apmeklēto URL vēsture. Jūs varat to šķirot daudzos veidos. -Comment[mk]=Ова е историја на URL кои скоро сте ги посетиле. Може да ги подредувате на разни начини. -Comment[mn]= Энэ бол таны хамгийн сүүлд айлчилсан URL хаягуудын түүх юм. Та тэдгээрийг янз бүрээр эрэмбэлж болно. -Comment[ms]=Ini ialah sejarah URL yang baru anda lawati. Anda tidak boleh isihkan ia dalam banyak cara. -Comment[mt]=Din hija kronoloġija tal-URLs kollha li żort reċentement. Tista' tissortjahom b'diversi modi. -Comment[nb]=Dette er en liste over de nettadressene du har vært innom nylig. Du kan sortere dem på ulike måter. -Comment[nds]=Dit is de Vörgeschicht vun Sieden, de Du tolest besöcht hest. Du kannst se op mennige Oorden sorteren. -Comment[ne]=यो तपाईँले भर्खरै अवलोकन गर्नु भएको यूआरएलहरूको सूची हो । तीनिहरूलाई तपाईँले धेरै तरिकाले क्रमबद्ध गर्न सक्नुहुन्छ । -Comment[nl]=Dit is de geschiedenis van de URL-adressen waar u recentelijk bent geweest. U kunt ze op meerdere manieren sorteren. -Comment[nn]=Dette er historia over adressene du nyleg har vitja. Du kan sortera lista på mange måtar. -Comment[nso]=Ye ke histori ya di-URL tseo odi etetsego gabjale. Okadi rarolla ka mekgwa ye mentshi. -Comment[pa]=ਇਹ URL ਦੀ ਸੂਚੀ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਖੋਲੋ ਸਨ, ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਕਈ ਤਰਾਂ ਕ੍ਰਮਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। -Comment[pl]=Historia ostatnio odwiedzonych adresów URL. Można ją na różne sposoby posortować. -Comment[pt]=O histórico dos URLs visitados recentemente. É possível ordená-los de várias maneiras. -Comment[pt_BR]=Este é o histórico das URLs que você visitou recentemente. Você pode ordenar esta lista de várias maneiras. -Comment[ro]=Acesta este istoricul URL-urilor pe care le-ați vizitat recent. Le puteți sorta în diferite moduri. -Comment[ru]=Журнал недавно посещённых адресов (URL). Его можно настраивать по своему усмотрению. -Comment[rw]=Aya ni amateka ya URL wasuye vuba. Ushobora kuzishungura mu buryo bwinshi. -Comment[se]=Dán listtus oainnát čujuhusaid maid áiddo leat guossohan. Don sáhtát erohallat listtu máŋgga láhkai. -Comment[sk]=Toto je história URL, ktoré ste naposledy navštívili. Môžete ich utriediť rôznymi spôsobmi. -Comment[sl]=To je zgodovina URL-jev, ki ste jih pred kratkim obiskali. Lahko jih uredite na različne načine. -Comment[sr]=Ово је листа URL-ова које сте недавно посетили. Можете је поређати на разне начине. -Comment[sr@Latn]=Ovo je lista URL-ova koje ste nedavno posetili. Možete je poređati na razne načine. -Comment[sv]=Det här är historiken på de webbadresser du nyligen besökt. Du kan sortera dem på många sätt. -Comment[ta]=நீங்கள் தற்போது பார்த்த வலைப்பின்னல்களின் வரலாறு. அதை பல வழிகளில் வரிசைப்படுத்தலாம். -Comment[tg]=Ин саҳифаҳои аз торихчаи URL-ҳое ки охирон дидаед. Метавонед онҳоро ба ҳар сурати дархост мураттаб кунед. -Comment[th]=นี่เป็นประวัติเก็บ URL ที่คุณเคยไปมาก่อน โดยคุณสามารถเรียงลำดับมันได้ในหลายรูปแบบ -Comment[tr]=Bu sizim yakın geçmişte ziyaret ettiğiniz URL'lerin bir listesidir. Bunları bir çok şekilde sıralayabilirsiniz. -Comment[tt]=Soñğı arada qaralğan bulğan URL tezmäse. Anı törleçä tärtipläp bula. -Comment[uk]=Це - історія URL, які ви недавно відвідали. Ви можете також впорядкувати її будь-яким чином. -Comment[uz]=Yaqinda koʻrgan URL'larning tarixi. Ularni turlicha saralashingiz mumkin -Comment[uz@cyrillic]=Яқинда кўрган URL'ларнинг тарихи. Уларни турлича саралашингиз мумкин -Comment[ven]=Heyi ndi divhazwakale ya URL no i dalelaho zwazwino. Ni nga i lugisa nga ndila dzo fhambananho. -Comment[vi]=Đây là danh sách các URL bạn đã xem gần đây. Bạn có thể sắp xếp lại chúng theo vài cách khác nhau. -Comment[wa]=Cichal est l' istwere des URL ki vs avoz vizité enawaire. Vos les ploz arindjî di sacwantès manires. -Comment[xh]=Le yimbali yee URL obusandukuzindwendwela. Ungazibeka ngendlela ezininzi. -Comment[zh_CN]=这是您曾经浏览过的 URL 历史。您可以以多种方式对其排序。 -Comment[zh_TW]=這是您最近訪問的 URL 的歷史紀錄。您可以將它們以多種方式排序。 -Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi. + Open=false X-TDE-TreeModule=History X-TDE-SearchableTreeModule=true diff --git a/konqueror/sidebar/trees/init/home.desktop b/konqueror/sidebar/trees/init/home.desktop index 30ad5490d..ede7da54c 100644 --- a/konqueror/sidebar/trees/init/home.desktop +++ b/konqueror/sidebar/trees/init/home.desktop @@ -2,157 +2,11 @@ Type=Link URL=file:$HOME Icon=folder_home + Name=Home Folder -Name[af]=Tuis Gids -Name[ar]=منزلي -Name[az]=Ev Qovluğu -Name[be]=Хатняя тэчка -Name[bg]=Домашна директория -Name[bn]=ব্যক্তিগত ফোল্ডার -Name[br]=Renkell ar gêr -Name[bs]=Home direktorij -Name[ca]=Carpeta inici -Name[cs]=Domovská složka -Name[csb]=Domôcy katalog -Name[cy]=Plygell Cartref -Name[da]=Hjemmemappe -Name[de]=Persönlicher Ordner -Name[el]=Προσωπικός φάκελος -Name[eo]=Hejma dosierujo -Name[es]=Carpeta personal -Name[et]=Kodukataloog -Name[eu]=Etxeko karpeta -Name[fa]=پوشۀ آغازه -Name[fi]=Kotikansio -Name[fr]=Dossier personnel -Name[fy]=Persoanlike map -Name[ga]=Fillteán Baile -Name[gl]=Cartafol Persoal -Name[he]=תיקיית בית -Name[hi]=मुख फ़ोल्डर -Name[hr]=Početna mapa korisnika -Name[hu]=Saját könyvtár -Name[is]=Heimasvæði -Name[it]=Cartella Home -Name[ja]=ホームフォルダ -Name[ka]=საწყისი საქაღალდე -Name[kk]=Мекен қапшығы -Name[km]=ថតផ្ទះ -Name[ko]=홈 폴더 -Name[lt]=Namų aplankas -Name[lv]=Mājas mape -Name[mk]=Домашна папка -Name[mn]=Хувийн лавлах -Name[ms]=Folder Laman Utama -Name[mt]=Direttorju Personali -Name[nb]=Hjemmemappe -Name[nds]=Tohuus-Orner -Name[ne]=गृह फोल्डर -Name[nl]=Persoonlijke map -Name[nn]=Heimemappe -Name[pa]=ਘਰ ਫੋਲਡਰ -Name[pl]=Katalog domowy -Name[pt]=Pasta Pessoal -Name[pt_BR]=Pasta do Usuário -Name[ro]=Folder personal -Name[ru]=Домашняя папка -Name[rw]=Ububiko Urugo -Name[se]=Ruoktomáhppa -Name[sk]=Domovský priečinok -Name[sl]=Domača mapa -Name[sr]=Домаћа фасцикла -Name[sr@Latn]=Domaća fascikla -Name[sv]=Hemkatalog -Name[ta]=வீட்டு அடைவு -Name[te]=ఇంటి ఫొల్డర్ -Name[tg]=Феҳристи хонагӣ -Name[th]=โฟลเดอร์ส่วนตัว -Name[tr]=Başlangıç Dizini -Name[tt]=Ana Törgäk -Name[uk]=Домашня тека -Name[uz]=Uy jildi -Name[uz@cyrillic]=Уй жилди -Name[vi]=Thư mục Nhà -Name[wa]=Ridant måjhon -Name[zh_CN]=主文件夹 -Name[zh_TW]=家目錄 + Comment=This folder contains your personal files -Comment[af]=Hierdie kabinet bevat jou persoonlike lêers -Comment[ar]=هذا المجلّد يحتوي على ملفاتك الخاصة -Comment[az]=Bütün şəxsi fayllarınız bu qovluqda yer alır -Comment[be]=Гэтая тэчка ўтрымлівае вашы ўласныя файлы -Comment[bg]=Тази директория съдържа вашите лични файлове -Comment[bn]=এই ফোল্ডারে আপনার নিজের জাবতীয় ফাইল থাকে -Comment[bs]=Ovaj direktorij sadrži sve vaše osobne datoteke -Comment[ca]=Aquest directori conté els vostres fitxers personals -Comment[cs]=Tento adresář obsahuje vaše osobní soubory -Comment[csb]=Nen katalog zamëkô w se wszëtczé twòje priwatné lopczi -Comment[cy]=Mae'r plygell yma'n cadw eich ffeiliau personol -Comment[da]=Denne mappe indeholder dine personlige filer -Comment[de]=Dieser Ordner enthält Ihre persönlichen Dateien. -Comment[el]=Αυτός ο φάκελος περιέχει τα προσωπικά σας αρχεία -Comment[eo]=Tiu ĉi dosierujo enhavas viajn personajn dosierojn -Comment[es]=Esta carpeta contiene sus archivos personales -Comment[et]=See kataloog sisaldab sinu isiklike faile -Comment[eu]=Zeure fitxategiak karpeta honetan daude -Comment[fa]=این پوشه شامل پروندههای شخصی شماست -Comment[fi]=Tämä kansio sisältää henkilökohtaiset tiedostot -Comment[fr]=Ce dossier contient tous vos fichiers personnels -Comment[fy]=Dizze map befettet al jo persoanlike triemmen -Comment[ga]=Tá do chomhaid phearsanta san fhillteán seo -Comment[gl]=Este cartafol contén os seus ficheiros persoais -Comment[he]=תיקייה זו מכילה את הקבצים האישיים שלך -Comment[hi]=यह फ़ोल्डर आपकी निजी फ़ाइलें रखता है -Comment[hr]=Ova mapa sadrži vaše osobne datoteke -Comment[hu]=Ez a mappa tartalmazza az Ön személyes fájljait -Comment[is]=Þessi mappa inniheldur skjölin þín -Comment[it]=Questa cartella contiene i tuoi file personali -Comment[ja]=これはあなたの個人的なファイルを含むフォルダです -Comment[ka]=თქვენი პერსონალური ფაილების შესანახი საქაღალდე -Comment[kk]=Бұл қапшықта Сіздің дербес файлдарыңыз сақталады -Comment[km]=ថតនេះមានឯកសារផ្ទាល់ខ្លួនរបស់អ្នក -Comment[ko]=이 폴더는 개인 파일을 포함합니다 -Comment[lo]=ໂຟເດີນີ້ບັນຈຸແຟ້ມຕ່າງຯທີ່ເປັນສ່ວນຕົວຂອງທ່ານ -Comment[lt]=Šiame aplanke yra Jūsų asmeninės bylos -Comment[lv]=Šī mape satur jūsu personālos failus -Comment[mk]=Оваа папка ги содржи вашите лични датотеки -Comment[mn]=Энэ лавлах таны хувийн файлуудыг агуулна. -Comment[ms]=Folder ini mengandungi fail peribadi anda -Comment[mt]=Dan id-direttorju iżomm il-fajls personali kollha tiegħek. -Comment[nb]=Denne mappa inneholder dine personlige filer -Comment[nds]=In dissen Orner sünd dien egen Dateien -Comment[ne]=यो फोल्डरले तपाईँको व्यक्तिगत फाइलहरू समावेश गर्छ -Comment[nl]=Deze map bevat al uw persoonlijke bestanden -Comment[nn]=Denne mappa inneheld dine personlege filer. -Comment[nso]=Sephuthi se sena le difaele tsa gago tsa botho -Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ ਫਾਇਲਾਂ ਰੱਖਦਾ ਹੈ -Comment[pl]=Ten katalog zawiera wszystkie twoje osobiste pliki. -Comment[pt]=Esta pasta contém os seus ficheiros pessoais -Comment[pt_BR]=Esta pasta contém os seus arquivos pessoais -Comment[ro]=Acest director conține fișierele dumneavoastră personale -Comment[ru]=Папка ваших личных файлов -Comment[rw]=Ubu bubiko bufite amadosiye yihariye yawe -Comment[se]=Dán máhpas du iežat fiillat leat -Comment[sk]=Tento priečinok obsahuje vaše osobné súbory -Comment[sl]=Ta mapa vsebuje vaše osebne datoteke. -Comment[sr]=Ова фасцикла садржи ваше личне фајлове -Comment[sr@Latn]=Ova fascikla sadrži vaše lične fajlove -Comment[sv]=Den här katalogen innehåller dina personliga filer -Comment[ta]=இந்த அடைவில் உங்கள் அந்தரங்க கோப்புகள் உள்ளன -Comment[tg]=Ин феҳрист шомили файлҳои шахсии шумост -Comment[th]=โฟลเดอร์นี้บรรจุแฟ้มต่าง ๆ ที่เป็นส่วนตัวของคุณ -Comment[tr]=Bu dizin kişisel dosyalarınızı içerir -Comment[tt]=Bu törgäktä şäxsi biremnäreñ yata -Comment[uk]=Ця тека містить ваші персональні файли -Comment[uz]=Bu jild sizning shaxsiy fayllaringizdan iborat -Comment[uz@cyrillic]=Бу жилд сизнинг шахсий файлларингиздан иборат -Comment[ven]=Foludara ino ina dzifaela dzanu -Comment[vi]=Thư mục này chứa các tập tin của riêng bạn -Comment[wa]=Ci ridant chal a les fitchîs et dnêyes da vosse -Comment[xh]=Le ncwadi eneenkcukacha iqulathe iifayile zobuntu bakho -Comment[zh_CN]=此文件夹包含了您的个人文件 -Comment[zh_TW]=這個資料夾包含有您的個人文件 -Comment[zu]=Lesi sigcini samafayela siqukethe amafayela akho siqu + Open=false X-TDE-TreeModule=Directory X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/konqueror/sidebar/trees/init/remote.desktop b/konqueror/sidebar/trees/init/remote.desktop index 99869d192..1e077173b 100644 --- a/konqueror/sidebar/trees/init/remote.desktop +++ b/konqueror/sidebar/trees/init/remote.desktop @@ -1,85 +1,5 @@ [Desktop Entry] Name=Network -Name[af]=Netwerk -Name[ar]=الشبكة -Name[az]=Şəbəkə -Name[be]=Сетка -Name[bg]=Мрежа -Name[bn]=নেটওয়ার্ক -Name[br]=Rouedad -Name[bs]=Mreža -Name[ca]=Xarxa -Name[cs]=Síť -Name[csb]=Séc -Name[cy]=Rhwydwaith -Name[da]=Netværk -Name[de]=Netzwerk -Name[el]=Δίκτυο -Name[eo]=Reto -Name[es]=Red -Name[et]=Võrk -Name[eu]=Sarea -Name[fa]=شبکه -Name[fi]=Verkko -Name[fo]=Net -Name[fr]=Réseau -Name[fy]=Netwurk -Name[ga]=Líonra -Name[gl]=Rede -Name[he]=רשת -Name[hi]=नेटवर्क -Name[hr]=Mreža -Name[hu]=Hálózat -Name[id]=Jaringan -Name[is]=Net -Name[it]=Rete -Name[ja]=ネットワーク -Name[ka]=ქსელი -Name[kk]=Желі -Name[km]=បណ្ដាញ -Name[ko]=네트워크 -Name[lo]=ລະບົບເຄື່ອຄາຍ -Name[lt]=Tinklas -Name[lv]=Tīkls -Name[mk]=Мрежа -Name[mn]=Сүлжээ -Name[ms]=Rangkaian -Name[nb]=Nettverk -Name[nds]=Nettwark -Name[ne]=सञ्जाल -Name[nl]=Netwerk -Name[nn]=Nettverk -Name[nso]=Kgokagano -Name[oc]=Resèu -Name[pa]=ਨੈੱਟਵਰਕ -Name[pl]=Sieć -Name[pt]=Rede -Name[pt_BR]=Rede -Name[ro]=Rețea -Name[ru]=Сеть -Name[rw]=Urusobe -Name[se]=Fierbmi -Name[sk]=Sieť -Name[sl]=Omrežje -Name[sr]=Мрежа -Name[sr@Latn]=Mreža -Name[sv]=Nätverk -Name[ta]=வலைதளம் -Name[te]=నెట్ వర్క్ -Name[tg]=Шабака -Name[th]=ระบบเครือข่าย -Name[tr]=Ağ -Name[tt]=Çeltär -Name[uk]=Мережа -Name[uz]=Tarmoq -Name[uz@cyrillic]=Тармоқ -Name[ven]=Vhukwamani -Name[vi]=Mạng -Name[wa]=Rantoele -Name[xh]=Umsebenzi womnatha -Name[zh_CN]=网络 -Name[zh_TW]=網路 -Name[zu]=Uxhumano olusakazekile Icon=network Open=false X-TDE-TreeModule=Virtual diff --git a/konqueror/sidebar/trees/init/remote/.directory b/konqueror/sidebar/trees/init/remote/.directory index 0f347fafb..0e243af10 100644 --- a/konqueror/sidebar/trees/init/remote/.directory +++ b/konqueror/sidebar/trees/init/remote/.directory @@ -1,84 +1,4 @@ [Desktop Entry] Name=Network -Name[af]=Netwerk -Name[ar]=الشبكة -Name[az]=Şəbəkə -Name[be]=Сетка -Name[bg]=Мрежа -Name[bn]=নেটওয়ার্ক -Name[br]=Rouedad -Name[bs]=Mreža -Name[ca]=Xarxa -Name[cs]=Síť -Name[csb]=Séc -Name[cy]=Rhwydwaith -Name[da]=Netværk -Name[de]=Netzwerk -Name[el]=Δίκτυο -Name[eo]=Reto -Name[es]=Red -Name[et]=Võrk -Name[eu]=Sarea -Name[fa]=شبکه -Name[fi]=Verkko -Name[fo]=Net -Name[fr]=Réseau -Name[fy]=Netwurk -Name[ga]=Líonra -Name[gl]=Rede -Name[he]=רשת -Name[hi]=नेटवर्क -Name[hr]=Mreža -Name[hu]=Hálózat -Name[id]=Jaringan -Name[is]=Net -Name[it]=Rete -Name[ja]=ネットワーク -Name[ka]=ქსელი -Name[kk]=Желі -Name[km]=បណ្ដាញ -Name[ko]=네트워크 -Name[lo]=ລະບົບເຄື່ອຄາຍ -Name[lt]=Tinklas -Name[lv]=Tīkls -Name[mk]=Мрежа -Name[mn]=Сүлжээ -Name[ms]=Rangkaian -Name[nb]=Nettverk -Name[nds]=Nettwark -Name[ne]=सञ्जाल -Name[nl]=Netwerk -Name[nn]=Nettverk -Name[nso]=Kgokagano -Name[oc]=Resèu -Name[pa]=ਨੈੱਟਵਰਕ -Name[pl]=Sieć -Name[pt]=Rede -Name[pt_BR]=Rede -Name[ro]=Rețea -Name[ru]=Сеть -Name[rw]=Urusobe -Name[se]=Fierbmi -Name[sk]=Sieť -Name[sl]=Omrežje -Name[sr]=Мрежа -Name[sr@Latn]=Mreža -Name[sv]=Nätverk -Name[ta]=வலைதளம் -Name[te]=నెట్ వర్క్ -Name[tg]=Шабака -Name[th]=ระบบเครือข่าย -Name[tr]=Ağ -Name[tt]=Çeltär -Name[uk]=Мережа -Name[uz]=Tarmoq -Name[uz@cyrillic]=Тармоқ -Name[ven]=Vhukwamani -Name[vi]=Mạng -Name[wa]=Rantoele -Name[xh]=Umsebenzi womnatha -Name[zh_CN]=网络 -Name[zh_TW]=網路 -Name[zu]=Uxhumano olusakazekile Icon=network Open=false diff --git a/konqueror/sidebar/trees/init/remote/CMakeLists.txt b/konqueror/sidebar/trees/init/remote/CMakeLists.txt index 2c8099ed8..61be1f846 100644 --- a/konqueror/sidebar/trees/init/remote/CMakeLists.txt +++ b/konqueror/sidebar/trees/init/remote/CMakeLists.txt @@ -15,6 +15,8 @@ add_subdirectory( web ) ##### other data ################################ -install( FILES - .directory - DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote ) +tde_create_translated_desktop( + SOURCE .directory + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote + PO_DIR konqueror-desktops +) diff --git a/konqueror/sidebar/trees/init/remote/ftp/.directory b/konqueror/sidebar/trees/init/remote/ftp/.directory index 75e432e50..0f20ad6e8 100644 --- a/konqueror/sidebar/trees/init/remote/ftp/.directory +++ b/konqueror/sidebar/trees/init/remote/ftp/.directory @@ -1,56 +1,3 @@ [Desktop Entry] Name=FTP Archives -Name[az]=FTP Arxivləri -Name[bg]=FTP архиви -Name[br]=Dielloù FTP -Name[ca]=Arxius FTP -Name[cs]=FTP archívy -Name[csb]=Archiwa FTP -Name[cy]=Archif FTP -Name[da]=FTP-Arkiver -Name[de]=FTP-Archive -Name[el]=Αρχειοθήκες FTP -Name[eo]=FTP-Arkivoj -Name[es]=Archivos FTP -Name[et]=FTP-arhiivid -Name[fo]=FTP-søvn -Name[fr]=Archives FTP -Name[hi]=एफ़टीपी आर्काइव -Name[hr]=FTP arhive -Name[hu]=FTP -Name[id]=Arsip FTP -Name[is]=FTP gagnageymslur -Name[it]=Archivi FTP -Name[ja]=FTP アーカイブ -Name[km]=ប័ណ្ណសារ FTP -Name[ko]=FTP 저장소 -Name[lo]=ແຟ້ມບີບອັດ FTP -Name[lt]=FTP archyvai -Name[lv]=FTP Arhīvi -Name[mn]=FTP-Архив -Name[mt]=Arkivji FTP -Name[nb]=FTP-arkiv -Name[nds]=FTP-Archiven -Name[nl]=FTP-archieven -Name[nso]=Dipolokelo tsa FTP -Name[oc]=Archius FTP -Name[pl]=Archiwa FTP -Name[pt]=Arquivos de FTP -Name[pt_BR]=Arquivos de FTP -Name[ro]=Arhive FTP -Name[ru]=Серверы FTP -Name[sk]=FTP archívy -Name[sl]=Arhivi FTP -Name[sr]=FTP архиве -Name[sr@Latn]=FTP arhive -Name[sv]=FTP-arkiv -Name[tr]=FTP Arşivleri -Name[uk]=Архіви FTP -Name[uz]=FTP arxivlar -Name[uz@cyrillic]=FTP архивлар -Name[ven]=Fhethu huno vhulungwa zwa kale ha FTP -Name[wa]=Årtchives FTP -Name[xh]=Ushicilelo lukawonke-wonke kunye namanye amaxwebhu embali e FTP -Name[zh_TW]=FTP 歸檔 -Name[zu]=Imiqulu ye-FTP Icon=konqueror diff --git a/konqueror/sidebar/trees/init/remote/ftp/CMakeLists.txt b/konqueror/sidebar/trees/init/remote/ftp/CMakeLists.txt index 65168d634..311378b3b 100644 --- a/konqueror/sidebar/trees/init/remote/ftp/CMakeLists.txt +++ b/konqueror/sidebar/trees/init/remote/ftp/CMakeLists.txt @@ -9,6 +9,9 @@ # ################################################# -install( FILES +tde_create_translated_desktop( + SOURCE .directory tde_ftp.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote/ftp ) + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote/ftp + PO_DIR konqueror-desktops +) diff --git a/konqueror/sidebar/trees/init/remote/ftp/tde_ftp.desktop b/konqueror/sidebar/trees/init/remote/ftp/tde_ftp.desktop index 6d98116f6..0f42b6e8e 100644 --- a/konqueror/sidebar/trees/init/remote/ftp/tde_ftp.desktop +++ b/konqueror/sidebar/trees/init/remote/ftp/tde_ftp.desktop @@ -3,86 +3,6 @@ Type=Link URL=http://mirror.ppa.trinitydesktop.org/trinity Icon=ftp Name=TDE Official FTP -Name[af]=TDE Amptelike Ftp -Name[ar]=ميفاق نقل الملفات الرسمي لِــ TDE -Name[az]=TDE FTP vericisi -Name[be]=Афіцыйны FTP TDE -Name[bg]=Официален FTP сървър на TDE -Name[bn]=মূল কে.ডি.ই. এফ.টি.পি. -Name[br]=FTP ofisiel TDE -Name[bs]=TDE službeni FTP -Name[ca]=FTP oficial del TDE -Name[cs]=Oficiální FTP projektu TDE -Name[csb]=Òficjalnô serwera FTP dlô TDE -Name[cy]=FTP Swyddogol TDE -Name[da]=TDE's officielle FTP -Name[de]=FTP-Bereich von TDE -Name[el]=Επίσημο FTP του TDE -Name[eo]=Oficiala FTP-arĥivo de TDE -Name[es]=FTP oficial de TDE -Name[et]=TDE ametlik FTP sait -Name[eu]=TDEren FTP ofiziala -Name[fa]=قاپ رسمی TDE -Name[fi]=TDE:n virallinen FTP -Name[fr]=Site FTP officiel de TDE -Name[fy]=TDE's Offisjele FTP -Name[ga]=FTP Oifigiúil TDE -Name[gl]=FTP Oficial de TDE -Name[he]=ה־FTP הרשמי של TDE -Name[hi]=केडीई आधिकारिक एफटीपी -Name[hr]=TDE službeni FTP -Name[hu]=Hivatalos TDE FTP -Name[id]=FTP TDE Resmi -Name[is]=FTP gagnabanki TDE -Name[it]=FTP ufficiale di TDE -Name[ja]=TDE 公式 FTP -Name[ka]=TDE-ს ძირითადი FTP სერვერი -Name[kk]=Негізгі TDE FTP сервері -Name[km]=FTP ផ្លូវការរបស់ TDE -Name[ko]=TDE 공식 FTP -Name[lo]=ໄຊ້์ FTP ຢ່າງເປັນທາງການຂອງ TDE -Name[lt]=TDE oficialus FTP -Name[lv]=TDE Oficiālais FTP -Name[mk]=Официјален FTP на TDE -Name[mn]=КДЭ-н FTP- хаяг -Name[ms]=FTP Rasmi TDE -Name[mt]=FTP Uffiċjali tal-TDE -Name[nb]=TDEs offisielle FTP -Name[nds]=Dat offizielle TDE-FTP -Name[ne]=TDE आधिकारिक FTP -Name[nl]=TDE's Officiële FTP -Name[nn]=Offisiell TDE-FTP -Name[nso]=FTP ya Semolao ya TDE -Name[oc]=FTP oficial dèu TDE -Name[pa]=TDE ਮੂਲ FTP -Name[pl]=Oficjalny serwer FTP dla TDE -Name[pt]=FTP Oficial do TDE -Name[pt_BR]=FTP oficial do TDE -Name[ro]=Site FTP TDE oficial -Name[ru]=Основной FTP-сервер TDE -Name[rw]=TDE FTP yemewe -Name[se]=Almmolaš TDE-FTP -Name[sk]=Oficiálne FTP TDE -Name[sl]=Uradni FTP za TDE -Name[sr]=Званични TDE-ов FTP -Name[sr@Latn]=Zvanični TDE-ov FTP -Name[sv]=TDE:s officiella FTP-server -Name[ta]=TDE அலுவலக FTP -Name[te]=కెడిఈ అధికారిక ఎఫ్ టి పి -Name[tg]=TDE расмии FTP -Name[th]=ไซต์ FTP ทางการของ TDE -Name[tr]=TDE FTP sunucusu -Name[tt]=TDE'nıñ Räsmi FTP -Name[uk]=Офіціальний FTP TDE -Name[uz]=Rasmiy TDE FTP -Name[uz@cyrillic]=Расмий TDE FTP -Name[ven]=FTP ya ofishiala ya TDE -Name[vi]=FTP chính thức của TDE -Name[wa]=Site FTP oficir di TDE -Name[xh]=TDE Osemthethweni FTP -Name[zh_CN]=TDE 官方 FTP -Name[zh_TW]=TDE 官方 FTP 站 -Name[zu]=I-FTP esemthethweni ye-TDE Open=false X-TDE-TreeModule=Directory X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/konqueror/sidebar/trees/init/remote/web/.directory b/konqueror/sidebar/trees/init/remote/web/.directory index a97874410..3dc410bce 100644 --- a/konqueror/sidebar/trees/init/remote/web/.directory +++ b/konqueror/sidebar/trees/init/remote/web/.directory @@ -1,56 +1,3 @@ [Desktop Entry] Name=Web Sites -Name[az]=İnternet Saytları -Name[bg]=Уеб страници -Name[br]=Lec'hiennoù gwiad -Name[ca]=Llocs Web -Name[cs]=Webové stránky -Name[csb]=Starnë WWW -Name[cy]=Gwefannau -Name[da]=Netsteder -Name[de]=Internetseiten -Name[el]=Τόποι στο διαδίκτυο -Name[eo]=Retejoj -Name[es]=Sitios web -Name[et]=Veebileheküljed -Name[fo]=Vevstøð -Name[fr]=Sites Web -Name[hi]=वेब साइट्स -Name[hr]=Web-lokacije -Name[hu]=Weboldalak -Name[id]=Situs Web -Name[is]=Vefsvæði -Name[it]=Siti web -Name[ja]=ウェブサイト -Name[km]=តំបន់បណ្ដាញ -Name[ko]=웹 사이트 -Name[lo]=ເວ໊ບໄຊ์ -Name[lt]=Žiniatinklio svetainės -Name[lv]=Tīmekļa vietas -Name[mn]=Вэб хуудсууд -Name[nb]=Nettsteder -Name[nds]=Nettsieden -Name[nl]=Websites -Name[nso]=Mafelo a Web -Name[oc]=Sitis web -Name[pl]=Strony WWW -Name[pt]=Páginas Web -Name[pt_BR]=Páginas Web -Name[ro]=Sit-uri de Web -Name[ru]=Веб-сайты -Name[sk]=Webové stránky -Name[sl]=Spletne strani -Name[sr]=Веб сајтови -Name[sr@Latn]=Veb sajtovi -Name[sv]=Webbplatser -Name[tg]=Саҳифаҳои Веб -Name[tr]=Web Siteleri -Name[uk]=Веб-сайти -Name[uz]=Veb-saytlar -Name[uz@cyrillic]=Веб-сайтлар -Name[ven]=Webu saiti -Name[wa]=Sites waibes -Name[xh]=Amanxuwa e Web -Name[zh_TW]=網站 -Name[zu]=Iziza ze-Web Icon=konqueror diff --git a/konqueror/sidebar/trees/init/remote/web/CMakeLists.txt b/konqueror/sidebar/trees/init/remote/web/CMakeLists.txt index 8517bed45..0aec4a088 100644 --- a/konqueror/sidebar/trees/init/remote/web/CMakeLists.txt +++ b/konqueror/sidebar/trees/init/remote/web/CMakeLists.txt @@ -9,6 +9,9 @@ # ################################################# -install( FILES +tde_create_translated_desktop( + SOURCE .directory apps_web.desktop dot_web.desktop tde_web.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote/web ) + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote/web + PO_DIR konqueror-desktops +) diff --git a/konqueror/sidebar/trees/init/remote/web/apps_web.desktop b/konqueror/sidebar/trees/init/remote/web/apps_web.desktop index 5ce562467..f30bae524 100644 --- a/konqueror/sidebar/trees/init/remote/web/apps_web.desktop +++ b/konqueror/sidebar/trees/init/remote/web/apps_web.desktop @@ -2,85 +2,6 @@ Type=Link URL=http://www.opendesktop.org/s/Trinity Name=TDE Applications -Name[af]=TDE Programme -Name[ar]=تطبيقات TDE -Name[az]=TDE Proqramları -Name[be]=Праграмы TDE -Name[bg]=Програми за TDE -Name[bn]=কে.ডি.ই অ্যাপলিকেশন -Name[br]=Arloadoù TDE -Name[bs]=TDE Programi -Name[ca]=Aplicacions TDE -Name[cs]=TDE aplikace -Name[csb]=Programë TDE -Name[cy]=Cymhwysiadau TDE -Name[da]=TDE-programmer -Name[de]=TDE-Programme -Name[el]=Εφαρμογές TDE -Name[eo]=TDE-Aplikaĵoj -Name[es]=Aplicaciones de TDE -Name[et]=TDE rakendused -Name[eu]=TDEren aplikazioak -Name[fa]=کاربردهای TDE -Name[fi]=TDE:n sovellukset -Name[fr]=Applications TDE -Name[fy]=TDE Programma's -Name[ga]=Feidhmchláir TDE -Name[gl]=Aplicacións de TDE -Name[he]=יישומי TDE -Name[hi]=केडीई अनुप्रयोग -Name[hr]=TDE aplikacije -Name[hu]=TDE-alkalmazások -Name[is]=TDE Forrit -Name[it]=Applicazioni TDE -Name[ja]=TDE アプリケーション -Name[ka]=TDE-ს პროგრამები -Name[kk]=TDE қолданбалары -Name[km]=កម្មវិធីរបស់ TDE -Name[ko]=TDE 응용 프로그램 -Name[lo]=ແອບພີເຄຊັ້ນ TDE -Name[lt]=TDE programos -Name[lv]=TDE Aplikācijas -Name[mk]=TDE-апликации -Name[mn]=КДЭ-Програм -Name[ms]=Aplikasi TDE -Name[mt]=Programmi TDE -Name[nb]=TDE-programmer -Name[nds]=TDE-Programmen -Name[ne]=TDE अनुप्रयोग -Name[nl]=TDE Programma's -Name[nn]=TDE-program -Name[nso]=Ditshomiso tsa TDE -Name[pa]=TDE ਕਾਰਜ -Name[pl]=Programy TDE -Name[pt]=Aplicações do TDE -Name[pt_BR]=Aplicativos TDE -Name[ro]=Aplicații TDE -Name[ru]=Приложения TDE -Name[rw]=Porogaramu TDE -Name[se]=TDE-prográmmat -Name[sk]=Aplikácie TDE -Name[sl]=Uporabniški programi -Name[sr]=TDE програми -Name[sr@Latn]=TDE programi -Name[ss]=Ticelo te TDE -Name[sv]=TDE-program -Name[ta]=TDE நிரல்கள் -Name[te]=కెడిఈ కార్యక్రమాలు -Name[tg]=Барномаҳои TDE -Name[th]=แอพพลิเคชัน TDE -Name[tr]=TDE Uygulamaları -Name[tt]=TDE Yazılımnarı -Name[uk]=Програми TDE -Name[uz]=TDE dasturlar -Name[uz@cyrillic]=TDE дастурлар -Name[ven]=Apulifikhesheni ya TDE -Name[vi]=Ứng dụng cho TDE -Name[wa]=Programes TDE -Name[xh]=Izicelo ze TDE -Name[zh_CN]=TDE 应用程序 -Name[zh_TW]=TDE 應用程式 -Name[zu]=Abayaleli be-TDE Icon=www Open=false X-TDE-TreeModule=Directory diff --git a/konqueror/sidebar/trees/init/remote/web/dot_web.desktop b/konqueror/sidebar/trees/init/remote/web/dot_web.desktop index 2494d2f12..752e8a1a9 100644 --- a/konqueror/sidebar/trees/init/remote/web/dot_web.desktop +++ b/konqueror/sidebar/trees/init/remote/web/dot_web.desktop @@ -2,84 +2,6 @@ Type=Link URL=http://www.trinitydesktop.org/news.php Name=TDE News -Name[af]=TDE Nuus -Name[ar]=أخبار TDE -Name[az]=TDE Xəbərləri -Name[be]=Навіны TDE -Name[bg]=Новини за TDE -Name[bn]=কে.ডি.ই. সংবাদ -Name[br]=Keleier TDE -Name[bs]=TDE Novosti -Name[ca]=Notícies TDE -Name[cs]=Novinky TDE -Name[csb]=Nowinë TDE -Name[cy]=Newyddion TDE -Name[da]=TDE-nyheder -Name[de]=TDE-Nachrichten -Name[el]=Νέα TDE -Name[eo]=TDE-Novaĵoj -Name[es]=Noticias de TDE -Name[et]=TDE uudised -Name[eu]=TDEren albisteak -Name[fa]=اخبار TDE -Name[fi]=TDE:n uutiset -Name[fr]=Les nouvelles sur TDE -Name[fy]=TDE Nijs -Name[ga]=Nuacht TDE -Name[gl]=Novas de TDE -Name[he]=חדשות TDE -Name[hi]=केडीई समाचार -Name[hr]=TDE novosti -Name[hu]=TDE hírek -Name[is]=TDE fréttir -Name[it]=Notizie di TDE -Name[ja]=TDE ニュース -Name[ka]=TDE-ს სიახლეები -Name[kk]=TDE жаңалықтары -Name[km]=ព័ត៌មាន TDE -Name[ko]=TDE 뉴스 -Name[lo]=ຂ່າວຂອງ TDE -Name[lt]=TDE naujienos -Name[lv]=TDE Ziņas -Name[mk]=TDE-вести -Name[mn]=КДЭ-Мэдээ -Name[ms]=Berita TDE -Name[mt]=Aħbarijiet TDE -Name[nb]=TDE-nyheter -Name[nds]=TDE-Narichten -Name[ne]=TDE समाचार -Name[nl]=TDE Nieuws -Name[nn]=TDE-nyhende -Name[nso]=Ditaba tsa TDE -Name[pa]=TDE ਖ਼ਬਰਾਂ -Name[pl]=Wiadomości TDE -Name[pt]=Notícias do TDE -Name[ro]=Știri TDE -Name[ru]=Новости TDE -Name[rw]=TDE Amakuru -Name[se]=TDE-ođđasat -Name[sk]=Novinky TDE -Name[sl]=Novice o TDE -Name[sr]=TDE вести -Name[sr@Latn]=TDE vesti -Name[ss]=Tindzaba te TDE -Name[sv]=TDE-nyheter -Name[ta]=TDE செய்திகள் -Name[te]=కెడిఈ వార్తలు -Name[tg]=Иттилоотҳои TDE -Name[th]=ข่าวของ TDE -Name[tr]=TDE Haberleri -Name[tt]=TDE Yañalıqları -Name[uk]=Новини TDE -Name[uz]=TDE yangiliklar -Name[uz@cyrillic]=TDE янгиликлар -Name[ven]=Mafhungo a TDE -Name[vi]=Tin tức TDE -Name[wa]=Noveles di TDE -Name[xh]=Iindaba ze TDE -Name[zh_CN]=TDE 新闻 -Name[zh_TW]=TDE 新聞 -Name[zu]=Izindaba ze-TDE Icon=www Open=false X-TDE-TreeModule=Directory diff --git a/konqueror/sidebar/trees/init/remote/web/tde_web.desktop b/konqueror/sidebar/trees/init/remote/web/tde_web.desktop index 5b3428282..1ad1b5cf4 100644 --- a/konqueror/sidebar/trees/init/remote/web/tde_web.desktop +++ b/konqueror/sidebar/trees/init/remote/web/tde_web.desktop @@ -2,86 +2,6 @@ Type=Link URL=http://www.trinitydesktop.org Name=TDE Home Page -Name[af]=TDE Tuisblad -Name[ar]=موقع TDE على الشبكة -Name[az]=TDE Ana Səhifəsi -Name[be]=Хатняя старонка TDE -Name[bg]=Домашна страница на TDE -Name[bn]=কে.ডি.ই. হোম পেজ -Name[br]=Pajenn Er-Gêr TDE -Name[bs]=TDE web stranica -Name[ca]=Pàgina inici de TDE -Name[cs]=Domovská stránka TDE -Name[csb]=Domôcô starna TDE -Name[cy]=Hafan TDE -Name[da]=TDE-hjemmeside -Name[de]=TDE-Startseite -Name[el]=Ιστοσελίδα του TDE -Name[eo]=TTTejo de TDE -Name[es]=Página Web de TDE -Name[et]=TDE kodulehekülg -Name[eu]=TDEren hasierako orria -Name[fa]=صفحه آغازۀ TDE -Name[fi]=TDE:n kotisivu -Name[fr]=Page d'accueil de TDE -Name[fy]=TDE's Thússide -Name[ga]=Leathanach Baile TDE -Name[gl]=Páxina Web de TDE -Name[he]=אתר הבית של TDE -Name[hi]=केडीई मुख पृष्ठ -Name[hr]=TDE glavna stranica -Name[hu]=TDE honlap -Name[id]=Home Page TDE -Name[is]=Heimasíða TDE -Name[it]=Homepage di TDE -Name[ja]=TDE ホームページ -Name[ka]=TDE-ს ვებ გვერდი -Name[kk]=TDE веб-сайты -Name[km]=គេហទំព័រ TDE -Name[ko]=TDE 홈페이지 -Name[lo]=ໂຫມເພຈ TDE -Name[lt]=TDE namų puslapis -Name[lv]=TDE Mājas Lapa -Name[mk]=Домашната страница на TDE -Name[mn]=КДЭ-Эхлэл хуудас -Name[ms]=Laman Utama TDE -Name[mt]=Homepage tal-TDE -Name[nb]=TDEs hjemmeside -Name[nds]=TDE-Nettsiet -Name[ne]=TDE गृह पृष्ठ -Name[nl]=TDE's startpagina -Name[nn]=TDE-nettstaden -Name[nso]=Letlakala la Gae la TDE -Name[oc]=Pagina iniciau de TDE -Name[pa]=TDE ਮੁੱਖ ਸਫਾ -Name[pl]=Strona domowa TDE -Name[pt]=Página do TDE -Name[pt_BR]=Página principal do TDE -Name[ro]=Site-ul TDE -Name[ru]=Основной сайт TDE -Name[rw]=TDE Ipajitwinjira -Name[se]=TDE-ruoktosiidu -Name[sk]=Domovská stránka TDE -Name[sl]=Domača stran TDE -Name[sr]=Матична страна TDE-а -Name[sr@Latn]=Matična strana TDE-a -Name[sv]=TDE:s webbplats -Name[ta]=TDE வீட்டுப் பக்கம் -Name[te]=కెడిఈ ఇంటి పుట -Name[tg]=Сафҳаи хонагии TDE -Name[th]=โฮมเพจ TDE -Name[tr]=TDE Ana Sayfası -Name[tt]=TDE Anabite -Name[uk]=Домашня сторінка TDE -Name[uz]=TDE veb-sayti -Name[uz@cyrillic]=TDE веб-сайти -Name[ven]=Siatari la TDE -Name[vi]=Trang nhà của TDE -Name[wa]=Pådje måjhon di TDE -Name[xh]=Iphepha Lasekhaya le TDE -Name[zh_CN]=TDE 主页 -Name[zh_TW]=TDE 首頁 -Name[zu]=Ikhasi lasekhaya le-TDE Icon=www Open=false X-TDE-TreeModule=Directory diff --git a/konqueror/sidebar/trees/init/root.desktop b/konqueror/sidebar/trees/init/root.desktop index d022bb00f..79418cb01 100644 --- a/konqueror/sidebar/trees/init/root.desktop +++ b/konqueror/sidebar/trees/init/root.desktop @@ -2,157 +2,11 @@ Type=Link URL=file:/ Icon=folder_red + Name=Root Folder -Name[af]=Basis Gids -Name[ar]=مجلد الجذر -Name[az]=Ali İstifadəçi Qovluğu -Name[be]=Каранёвая тэчка -Name[bg]=Главна директория -Name[bn]=রুট ফোল্ডার -Name[br]=Renkell gwrizienn -Name[bs]=Root direktorij -Name[ca]=Carpeta arrel -Name[cs]=Kořenová složka -Name[csb]=Przédny katalog (root) -Name[cy]=Plygell Gwraidd -Name[da]=Rodmappe -Name[de]=Basisordner -Name[el]=Ριζικός φάκελος -Name[eo]=Baza dosierujo -Name[es]=Directorio raiz -Name[et]=Juurkataloog -Name[eu]=Erro karpeta -Name[fa]=پوشۀ ریشه -Name[fi]=Juurikansio -Name[fr]=Dossier racine -Name[fy]=Haadmap -Name[ga]=Fréamhfhillteán -Name[gl]=Cartafol Raíz -Name[he]=תיקיית שורש -Name[hi]=रूट फ़ोल्डर -Name[hr]=Korijenska mapa -Name[hu]=Gyökérkönyvtár -Name[is]=Rótarmappa -Name[it]=Cartella radice -Name[ja]=ルートフォルダ -Name[ka]=ძირეული საქაღალდე -Name[kk]=Түбір қапшығы -Name[km]=ថត Root -Name[ko]=루트 폴더 -Name[lt]=Root aplankas -Name[lv]=Saknes katalogs -Name[mk]=Коренова папка -Name[mn]=Язгуур лавлах -Name[ms]=Folder Root -Name[mt]=Direttorju root -Name[nb]=Rotkatalog -Name[nds]=Wörtelorner -Name[ne]=रुट फोल्डर -Name[nl]=Hoofdmap -Name[nn]=Rotmappe -Name[pa]=ਰੂਟ(root) ਫੋਲਡਰ -Name[pl]=Katalog główny -Name[pt]=Pasta Raiz -Name[pt_BR]=Pasta Raiz -Name[ro]=Folder rădăcină -Name[ru]=Корневая папка -Name[rw]=Ububiko Umuzi -Name[se]=Ruohtasmáhppa -Name[sk]=Koreňový priečinok -Name[sl]=Korenska mapa -Name[sr]=Корена фасцикла -Name[sr@Latn]=Korena fascikla -Name[sv]=Rotkatalog -Name[ta]=ஆரம்ப அடைவு -Name[te]=రూట్ ఫొల్డర్ -Name[tg]=Феҳристи реша -Name[th]=โฟลเดอร์ราก -Name[tr]=Kök Dizini -Name[tt]=Töp Törgäk -Name[uk]=Коренева тека -Name[uz]=Tub jildi -Name[uz@cyrillic]=Туб жилди -Name[vi]=Thư mục Gốc -Name[wa]=Ridant raecene -Name[zh_CN]=根文件夹 -Name[zh_TW]=Root 資料夾 + Comment=This is the root of the filesystem -Comment[af]=Hierdie is die basis van die lêer stelsel -Comment[ar]=هذا هو الجذر لنظام الملفات -Comment[az]=Bu, fayl sisteminizin köküdür -Comment[be]=Гэта пачатак файлавай сістэмы -Comment[bg]=Тази директория е главната директория на системата -Comment[bn]=এটি ফাইলসিস্টেমের মূল (root) -Comment[bs]=Ovo je korijen datotečnog sistema -Comment[ca]=Aquest és l'arrel del sistema de fitxers -Comment[cs]=Toto je kořenový adresář souborového systému -Comment[csb]=Je to kòrzéń systemë lopków (przédny katalog - root) -Comment[cy]=Dyma wraidd y cysawd ffeiliau -Comment[da]=Dette er roden af filsystemet -Comment[de]=Dies ist der Basisordner Ihres Dateisystems -Comment[el]=Αυτή είναι η ρίζα του συστήματος αρχείων -Comment[eo]=Jen la radiko de la dosieraro -Comment[es]=Esta es la raíz del sistema de archivos -Comment[et]=See on failisüsteemi ülemkataloog -Comment[eu]=Hau fitxategi sistemaren erroa da -Comment[fa]=این ریشه سیستم پرونده است -Comment[fi]=Tämä on tiedostojärjestelmän juuri -Comment[fr]=Ce dossier est à la racine de votre arborescence -Comment[fy]=Dit is de haad fan it triemsysteem -Comment[ga]=Seo fréamh an comhadchórais -Comment[gl]=Ésta é a raiz do sistema de arquivos -Comment[he]=זהו השורש של מערכת הקבצים שלך -Comment[hi]=यह फ़ाइल सिस्टम का रूट है -Comment[hr]=Korijenska mapa datotečnog sustava -Comment[hu]=Ez a fájlrendszer gyökere -Comment[is]=Þetta er rót skráarkerfisins -Comment[it]=Questa è la radice del filesystem -Comment[ja]=ファイルシステムのルートです -Comment[ka]=ფაილური სისტემუს ძირეული საქაღალდე -Comment[kk]=Файл жүйесінің түбірі -Comment[km]=នេះជាឫសរបស់ប្រព័ន្ធឯកសារ -Comment[ko]=파일 시스템의 루트입니다 -Comment[lo]=ນີ້ເປັນຮາກຂອງລະບົບແຟ້ມ -Comment[lt]=Tai yra bylų sistemos pradžia -Comment[lv]=Šī ir failusistēmas sakne -Comment[mk]=Ова е коренот на датотечниот системот -Comment[mn]=Энэ бол таны файлын системийн язгуур -Comment[ms]=Ini ialah root bagi sistem fail -Comment[mt]=Dan huwa d-direttorju ewlieni tas-sistema -Comment[nb]=Dette er rota til filsystemet -Comment[nds]=Dit is dat Dateisysteem sien Wörtel -Comment[ne]=यो फाइल प्रणालीको रुट हो -Comment[nl]=Dit is de root van het bestandssysteem -Comment[nn]=Dette er rota i filsystemet. -Comment[nso]=Se ke modu wa system ya faele -Comment[pa]=ਇਹ ਫਾਇਲ ਸਿਸਟਮ ਦਾ ਰੂਟ (root) ਹੈ -Comment[pl]=To jest korzeń systemu plików (czyli katalog główny) -Comment[pt]=Este é o topo do sistema de ficheiros -Comment[pt_BR]=Esta é a raiz do seu sistema de arquivos -Comment[ro]=Aceasta este rădăcina sistemului de fișiere -Comment[ru]=Корневая папка файловой системы -Comment[rw]=Uyu ni umuzi w'idosiyesisitemu -Comment[se]=Dát lea du fiilavuogádaga ruohtas -Comment[sk]=Toto je koreňový priečinok systému súborov -Comment[sl]=To je koren datotečnega sistema. -Comment[sr]=Ово је корен система фајлова -Comment[sr@Latn]=Ovo je koren sistema fajlova -Comment[sv]=Det här är roten på filsystemet -Comment[ta]=இதுவே கோப்பு அமைப்பின் வேராகும் -Comment[tg]=Инҷо решаи системаи файл аст -Comment[th]=นี่เป็นรากของระบบแฟ้ม -Comment[tr]=Bu dosya sisteminizi kök dizinidir -Comment[tt]=Birem sistemeneñ töp törgäge bu -Comment[uk]=Це - корінь файлової системи -Comment[uz]=Fayl tizimining tubi -Comment[uz@cyrillic]=Файл тизимининг туби -Comment[ven]=Hoyu ndi mudzi wa maitele a faela -Comment[vi]=Đây là gốc của hệ thống tập tin -Comment[wa]=Cichal est li ridant raecene do sistinme di fitchîs -Comment[xh]=Le yingcambu yendlela yefayile -Comment[zh_CN]=这是文件系统的根 -Comment[zh_TW]=這是檔案系統的根目錄 -Comment[zu]=Le yimpande yesistimu yamafayela + Open=false X-TDE-TreeModule=Directory X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/konqueror/sidebar/trees/init/services.desktop b/konqueror/sidebar/trees/init/services.desktop index 19d36d03f..345eaaf91 100644 --- a/konqueror/sidebar/trees/init/services.desktop +++ b/konqueror/sidebar/trees/init/services.desktop @@ -2,83 +2,6 @@ URL= Icon=services Name=Services -Name[af]=Dienste -Name[ar]=الخدمات -Name[az]=Xidmətlər -Name[be]=Сервісы -Name[bg]=Услуги -Name[bn]=সার্ভিসসমূহ -Name[br]=Servijoù -Name[bs]=Servisi -Name[ca]=Serveis -Name[cs]=Služby -Name[csb]=Ùsłëżnotë -Name[cy]=Gwasanaethau -Name[da]=Tjenester -Name[de]=Dienste -Name[el]=Υπηρεσίες -Name[eo]=Servoj -Name[es]=Servicios -Name[et]=Teenused -Name[eu]=Zerbitzuak -Name[fa]=خدمات -Name[fi]=Palvelut -Name[fo]=Tænastur -Name[fy]=Tsjinsten -Name[ga]=Seirbhísí -Name[gl]=Servizos -Name[he]=שירותים -Name[hi]=सेवाएं -Name[hr]=Usluge -Name[hu]=Szolgáltatások -Name[is]=Þjónustur -Name[it]=Servizi -Name[ja]=サービス -Name[ka]=სერვისები -Name[kk]=Қызметтер -Name[km]=សេវា -Name[ko]=서비스 -Name[lo]=ບໍລິການ -Name[lt]=Tarnybos -Name[lv]=Servisi -Name[mk]=Сервиси -Name[mn]=КДЭ-Үйлчилгээ -Name[ms]=Servis -Name[mt]=Servizzi -Name[nb]=Tjenester -Name[nds]=TDE-Deensten -Name[ne]=सेवा -Name[nn]=Tenester -Name[nso]=Ditirelo -Name[pa]=ਸੇਵਾਵਾਂ -Name[pl]=Usługi -Name[pt]=Serviços -Name[pt_BR]=Serviços -Name[ro]=Servicii -Name[ru]=Сервисы -Name[rw]=Serivise -Name[se]=Bálvalusat -Name[sk]=Služby -Name[sl]=Storitve -Name[sr]=Сервиси -Name[sr@Latn]=Servisi -Name[sv]=Tjänster -Name[ta]=சேவைகள் -Name[te]=సేవలు -Name[tg]=Хидматҳо -Name[th]=บริการ -Name[tr]=Servisler -Name[tt]=Xezmätlär -Name[uk]=Служби -Name[uz]=Xizmatlar -Name[uz@cyrillic]=Хизматлар -Name[ven]=Dzitshumelo -Name[vi]=Các dịch vụ -Name[wa]=Siervices -Name[xh]=Iinkonzo -Name[zh_CN]=服务 -Name[zh_TW]=服務 -Name[zu]=Imisebenzi Open=false X-TDE-TreeModule=Virtual X-TDE-RelURL=services diff --git a/konqueror/sidebar/trees/init/services/.directory b/konqueror/sidebar/trees/init/services/.directory index 7d2b5e78c..56c035364 100644 --- a/konqueror/sidebar/trees/init/services/.directory +++ b/konqueror/sidebar/trees/init/services/.directory @@ -1,81 +1,4 @@ [Desktop Entry] Icon=pipe Name=Services -Name[af]=Dienste -Name[ar]=الخدمات -Name[az]=Xidmətlər -Name[be]=Сервісы -Name[bg]=Услуги -Name[bn]=সার্ভিসসমূহ -Name[br]=Servijoù -Name[bs]=Servisi -Name[ca]=Serveis -Name[cs]=Služby -Name[csb]=Ùsłëżnotë -Name[cy]=Gwasanaethau -Name[da]=Tjenester -Name[de]=KDE-Dienste -Name[el]=Υπηρεσίες -Name[eo]=Servoj -Name[es]=Servicios -Name[et]=Teenused -Name[eu]=Zerbitzuak -Name[fa]=خدمات -Name[fi]=Palvelut -Name[fo]=Tænastur -Name[fy]=Tsjinsten -Name[ga]=Seirbhísí -Name[gl]=Servizos -Name[he]=שירותים -Name[hi]=सेवाएं -Name[hr]=Usluge -Name[hu]=Szolgáltatások -Name[is]=Þjónustur -Name[it]=Servizi -Name[ja]=サービス -Name[ka]=სერვისები -Name[kk]=Қызметтер -Name[km]=សេវា -Name[ko]=서비스 -Name[lo]=ບໍລິການ -Name[lt]=Tarnybos -Name[lv]=Servisi -Name[mk]=Сервиси -Name[mn]=КДЭ-Үйлчилгээ -Name[ms]=Servis -Name[mt]=Servizzi -Name[nb]=Tjenester -Name[nds]=KDE-Deensten -Name[ne]=सेवा -Name[nn]=Tenester -Name[nso]=Ditirelo -Name[pa]=ਸੇਵਾਵਾਂ -Name[pl]=Usługi -Name[pt]=Serviços -Name[pt_BR]=Serviços -Name[ro]=Servicii -Name[ru]=Сервисы -Name[rw]=Serivise -Name[se]=Bálvalusat -Name[sk]=Služby -Name[sl]=Storitve -Name[sr]=Сервиси -Name[sr@Latn]=Servisi -Name[sv]=Tjänster -Name[ta]=சேவைகள் -Name[te]=సేవలు -Name[tg]=Хидматҳо -Name[th]=บริการ -Name[tr]=Servisler -Name[tt]=Xezmätlär -Name[uk]=Служби -Name[uz]=Xizmatlar -Name[uz@cyrillic]=Хизматлар -Name[ven]=Dzitshumelo -Name[vi]=Các dịch vụ -Name[wa]=Siervices -Name[xh]=Iinkonzo -Name[zh_CN]=服务 -Name[zh_TW]=服務 -Name[zu]=Imisebenzi Open=false diff --git a/konqueror/sidebar/trees/init/services/CMakeLists.txt b/konqueror/sidebar/trees/init/services/CMakeLists.txt index 524380aa8..2a73b19bc 100644 --- a/konqueror/sidebar/trees/init/services/CMakeLists.txt +++ b/konqueror/sidebar/trees/init/services/CMakeLists.txt @@ -9,7 +9,10 @@ # ################################################# -install( FILES +tde_create_translated_desktop( + SOURCE .directory audiocd.desktop printsystem.desktop media.desktop settings.desktop applications.desktop - DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services ) + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services + PO_DIR konqueror-desktops +) diff --git a/konqueror/sidebar/trees/init/services/applications.desktop b/konqueror/sidebar/trees/init/services/applications.desktop index c8b4d02ec..9ce50383b 100644 --- a/konqueror/sidebar/trees/init/services/applications.desktop +++ b/konqueror/sidebar/trees/init/services/applications.desktop @@ -3,77 +3,6 @@ Type=Link URL=applications:/ Icon=kmenu Name=Applications -Name[af]=Programme -Name[ar]=التطبيقات -Name[az]=Proqram Tə'minatları -Name[be]=Праграмы -Name[bg]=Програми -Name[bn]=অ্যাপলিকেশন -Name[br]=Arloadoù -Name[bs]=Programi -Name[ca]=Aplicacions -Name[cs]=Aplikace -Name[csb]=Programë -Name[cy]=Cymhwysiadau -Name[da]=Programmer -Name[de]=Programme -Name[el]=Εφαρμογές -Name[eo]=Aplikaĵoj -Name[es]=Aplicaciones -Name[et]=Rakendused -Name[eu]=Aplikazioak -Name[fa]=کاربردها -Name[fi]=Sovellukset -Name[fy]=Programma's -Name[ga]=Feidhmchláir -Name[gl]=Aplicacións -Name[he]=יישומים -Name[hi]=अनुप्रयोग -Name[hr]=Aplikacije -Name[hu]=Alkalmazások -Name[is]=Forrit -Name[it]=Applicazioni -Name[ja]=アプリケーション -Name[ka]=პროგრამები -Name[kk]=Қолданбалар -Name[km]=កម្មវិធី -Name[ko]=응용 프로그램 -Name[lt]=Programos -Name[lv]=Aplikācijas -Name[mk]=Апликации -Name[ms]=Aplikasi -Name[mt]=Programmi TDE -Name[nb]=Programmer -Name[nds]=Programmen -Name[ne]=अनुप्रयोग -Name[nl]=Programma's -Name[nn]=Program -Name[pa]=ਕਾਰਜ -Name[pl]=Programy -Name[pt]=Aplicações -Name[pt_BR]=Aplicativos -Name[ro]=Aplicații -Name[ru]=Приложения -Name[rw]=Amaporogaramu -Name[se]=Prográmmat -Name[sk]=Aplikácie -Name[sl]=Programi -Name[sr]=Програми -Name[sr@Latn]=Programi -Name[sv]=Program -Name[ta]=பயன்பாடுகள் -Name[te]=కార్యక్రమాలు -Name[tg]=Барномаҳо -Name[th]=แอพพลิเคชัน TDE -Name[tr]=Uygulamalar -Name[tt]=Yazılımnar -Name[uk]=Програми -Name[uz]=Dasturlar -Name[uz@cyrillic]=Дастурлар -Name[vi]=Ứng dụng -Name[wa]=Programes -Name[zh_CN]=应用程序 -Name[zh_TW]=應用程式 Open=false X-TDE-TreeModule=Directory X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/konqueror/sidebar/trees/init/services/audiocd.desktop b/konqueror/sidebar/trees/init/services/audiocd.desktop index e01ac7001..9356de994 100644 --- a/konqueror/sidebar/trees/init/services/audiocd.desktop +++ b/konqueror/sidebar/trees/init/services/audiocd.desktop @@ -4,83 +4,6 @@ URL=audiocd:/ Icon=media-optical-cdaudio-unmounted Name=Audio CD Browser -Name[af]=Musiek CD Blaaier -Name[ar]=متصفح الأقراص المدمجة الصوتية -Name[az]=Audio CD Səyyahı -Name[be]=Праглядальнік гукавых CD -Name[bg]=Аудио диск -Name[bn]=অডিও সিডি ব্রাউজার -Name[br]=Furcher ar CDoù klevet -Name[bs]=Audio CD preglednik -Name[ca]=Navegador d'àudio CD -Name[cs]=Prohlížeč zvukových CD -Name[csb]=Przezérnik audio CD -Name[cy]=Porydd CD Sain -Name[da]=Audio-cd-søger -Name[de]=Audio-CD -Name[el]=Περιηγητής CD ήχου -Name[eo]=Rigardilo por muzikaj lumdiskoj -Name[es]=Navegador de CD-Audio -Name[et]=Audio CD sirvija -Name[eu]=Audio CD arakatzailea -Name[fa]=مرورگر دیسک فشردۀ صوتی -Name[fi]=Audio CD:n selain -Name[fr]=Navigateur de CD audio -Name[fy]=Audio kompaktskiif blêder -Name[ga]=Brabhsálaí Dhlúthdhiosca Fuaime -Name[gl]=Navegador de CD de Audio -Name[he]=דפדפן תקליטורי שמע -Name[hi]=ऑडियो सीडी ब्राउज़र -Name[hr]=Glazbeni CD preglednik -Name[hu]=Hang-CD-böngésző -Name[is]=Tónlistardiskaflakkari -Name[it]=Navigazione dei CD audio -Name[ja]=オーディオ CD ブラウザ -Name[ka]=Audio CD-ს დათვალიერება -Name[kk]=Аудио CD шолғышы -Name[km]=កម្មវិធីរុករកស៊ីឌីសំឡេង -Name[lo]=ບາວເຊີ ຊີດີ ອໍດີໂອ້ -Name[lt]=Audio CD naršyklė -Name[lv]=Audio CD Pārlūks -Name[mk]=Прелистувач на аудио CD-а -Name[mn]=Аудио-КД-Хөтөч -Name[ms]=Pelayar CD Audio -Name[mt]=Browser CDs tal-Mużika -Name[nb]=Lyd-CD-leser -Name[nds]=Audio-CDs bekieken -Name[ne]=अडियो सीडी ब्राउजर -Name[nl]=Audio-cd Browser -Name[nn]=Lyd-CD-lesar -Name[nso]=Seinyakisi sa CD yeo e Kwagalago -Name[pa]=ਆਡੀਓ CD ਝਲਕਾਰਾ -Name[pl]=Przeglądarka audio CD -Name[pt]=Navegador de CDs Áudio -Name[pt_BR]=Navegador de CDs de Áudio -Name[ro]=Navigator CD audio -Name[ru]=Просмотр аудио CD -Name[rw]=Mucukumbuzi wa CD Inyumvo -Name[se]=Jietna-CD-logan -Name[sk]=Prehliadač zvukových CD -Name[sl]=Brskalnik po glasbenem CDju -Name[sr]=Прегледач аудио CD-ова -Name[sr@Latn]=Pregledač audio CD-ova -Name[sv]=Bläddrare för ljud-cd -Name[ta]=கேட்பொலி குறுந்தகடு உலாவி -Name[te]=ఆడియొ సిడి బ్రౌజర్ -Name[tg]=Тафсири Аудио CD -Name[th]=บราวเซอร์ซีดีเพลง -Name[tr]=Müzik CD -Name[tt]=Tawışlı CD Küzätüçe -Name[uk]=Навігатор аудіо КД -Name[uz]=Audio kompakt-disk brauzeri -Name[uz@cyrillic]=Аудио компакт-диск браузери -Name[ven]=Buronza ya CD ino thetsheleswa -Name[vi]=Duyệt CD nhạc -Name[wa]=Foyteuse des plakes lazer odio -Name[xh]=Umkhangeli zincwadi we CD Audio -Name[zh_CN]=音频 CD 浏览器 -Name[zh_TW]=音樂 CD 瀏覽器 -Name[zu]=Umcingi wama-CD ozwakalayo Open=false X-TDE-TreeModule=Directory diff --git a/konqueror/sidebar/trees/init/services/media.desktop b/konqueror/sidebar/trees/init/services/media.desktop index a74a01f09..36e66da0a 100644 --- a/konqueror/sidebar/trees/init/services/media.desktop +++ b/konqueror/sidebar/trees/init/services/media.desktop @@ -3,72 +3,6 @@ Type=Link URL=media:/ Icon=computer Name=Storage Media -Name[af]=Stoor Media -Name[ar]=وسائط التخزين -Name[be]=Носьбіты -Name[bg]=Съхраняващи устройства -Name[bn]=স্টোরেজ মিডিয়া -Name[bs]=Uređaji za smještaj podataka -Name[ca]=Suports d'emmagatzematge -Name[cs]=Úložná zařízení -Name[csb]=Zôpisowné media -Name[da]=Opbevaringsmedie -Name[de]=Speichermedien -Name[el]=Συσκευές αποθήκευσης -Name[eo]=Enmemoriga Medio -Name[es]=Dispositivos de almacenamiento -Name[et]=Andmekandjad -Name[eu]=Biltegiratze-euskarria -Name[fa]=رسانۀ ذخیرهگاه -Name[fi]=Tallennusmedia -Name[fr]=Support de stockage -Name[fy]=Opslachapparaten -Name[ga]=Meán Stórais -Name[gl]=Medios de armacenaxe -Name[he]=התקנים -Name[hi]=भंडार मीडिया -Name[hr]=Mediji za pohranjivanje -Name[hu]=Tárolóeszközök -Name[is]=Geymslumiðlar -Name[it]=Dispositivi di archiviazione -Name[ja]=記憶メディア -Name[ka]=მონაცემთა შენახვის მოწყობილობები -Name[kk]=Жинақтаушы құрылғылар -Name[km]=ឧបករណ៍ផ្ទុក -Name[lt]=Saugojimo įrenginiai -Name[lv]=Datu nesējs -Name[mk]=Медиуми за податоци -Name[ms]=Media Storan -Name[nb]=Lagringsenheter -Name[nds]=Spiekermedien -Name[ne]=भण्डारण मिडिया -Name[nl]=Opslagapparaten -Name[nn]=Lagringsmedium -Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -Name[pl]=Urządzenia przechowywania danych -Name[pt]=Dispositivos de Armazenamento -Name[pt_BR]=Mídia de Armazenamento -Name[ro]=Mediu de stocare -Name[ru]=Устройства хранения данных -Name[rw]=Uburyo bwo Kubika -Name[se]=Vurkenmedia -Name[sk]=Zálohovacie médiá -Name[sl]=Nosilci za shranjevanje -Name[sr]=Складишни медијуми -Name[sr@Latn]=Skladišni medijumi -Name[sv]=Lagringsmedia -Name[ta]=சேகரிப்பு ஊடகம் -Name[tg]=Захирагоҳи маълумот -Name[th]=สื่อเก็บข้อมูล -Name[tr]=Depolama Ortamı -Name[tt]=Saqlawlı Media -Name[uk]=Пристрої зберігання інформації -Name[uz]=Saqlash uskunalari -Name[uz@cyrillic]=Сақлаш ускуналари -Name[vi]=Ổ chứa Dữ liệu -Name[wa]=Sopoirts di wårdaedje -Name[zh_CN]=存储介质 -Name[zh_TW]=儲存媒體 Open=false X-TDE-TreeModule=Directory X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/konqueror/sidebar/trees/init/services/printsystem.desktop b/konqueror/sidebar/trees/init/services/printsystem.desktop index 198925db9..f368f2979 100644 --- a/konqueror/sidebar/trees/init/services/printsystem.desktop +++ b/konqueror/sidebar/trees/init/services/printsystem.desktop @@ -4,83 +4,6 @@ URL=print:/ Icon=document-print Name=Print System Browser -Name[af]=Drukker Stelsel Blaaier -Name[ar]=متصفح نظام الطباعة -Name[az]=Çap Sistemi Səyyahı -Name[be]=Праглядальнік сістэм друку -Name[bg]=Система за печат -Name[bn]=মুদ্রণ ব্যবস্থা ব্রাউজার -Name[bs]=Preglednik sistema štampe -Name[ca]=Navegador del sistema d'impressió -Name[cs]=Prohlížeč tiskového systému -Name[csb]=Przezérnik systemë drëkù -Name[cy]=Porydd y Cysawd Argraffu -Name[da]=Udskriftssystemsøger -Name[de]=Drucksystem -Name[el]=Προβολέας συστήματος εκτύπωσης -Name[eo]=Rigardilo por printosistemo -Name[es]=Navegador del sistema de impresión -Name[et]=Trükkimissüsteemi sirvija -Name[eu]=Inprimaketa sistemaren arakatzailea -Name[fa]=مرورگر سیستم چاپ -Name[fi]=Tulostusjärjestelmä -Name[fr]=Navigateur dans le système d'impression -Name[fy]=Printsysteemblêder -Name[ga]=Brabhsálaí an Chóras Priontála -Name[gl]=Navegador do Sistema de Impresión -Name[he]=דפדפן מערכות הדפסה -Name[hi]=मुद्ण तंत्र ब्राउज़र -Name[hr]=Preglednik sustava ispisivanja -Name[hu]=A nyomtatók böngészése -Name[is]=Prentaraflakk -Name[it]=Navigazione del sistema di stampa -Name[ja]=印刷システムブラウザ -Name[ka]=ბეჭდვის სისტემის დათვალიერება -Name[kk]=Басып шығару жүйесін шолғышы -Name[km]=កម្មវិធីរុករកប្រព័ន្ធបោះពុម្ព -Name[ko]=인쇄 시스템 탐색기 -Name[lo]=ການຮງກເບິ່ງລະບົບການພິມ -Name[lt]=Spausdinimo sistemos naršyklė -Name[lv]=Drukas Sistēmas Pārlūks -Name[mk]=Прелистувач на печатарскиот систем -Name[mn]=Хэдлэх системийн хөтөч -Name[ms]=Pelayar Sistem Cetak -Name[mt]=Browser tas-sistema ta' pprintjar -Name[nb]=Visning av utskriftssystem -Name[nds]=Drucksysteem bekieken -Name[ne]=मुद्रण प्रणाली ब्राउजर -Name[nl]=Afdruksysteembrowser -Name[nn]=Vising av utskriftssystem -Name[nso]=Seinyakisi sa System ya Kgatiso -Name[pa]=ਪਰਿੰਟ ਸਿਸਟਮ ਝਲਕਾਰਾ -Name[pl]=Przeglądarka systemu drukowania -Name[pt]=Navegador do Sistema de Impressão -Name[pt_BR]=Sistema de Impressão -Name[ro]=Navigator sistem tipărire -Name[ru]=Просмотр системы печати -Name[rw]=Mucukumbuzi Sisitemu Gucapa -Name[se]=Čájet čálihanvuogádaga -Name[sk]=Prehliadač tlačového systému -Name[sl]=Brskalnik po tiskalniškem sistemu -Name[sr]=Прегледач система за штампу -Name[sr@Latn]=Pregledač sistema za štampu -Name[sv]=Bläddrare för utskriftssystem -Name[ta]=அச்சு அமைப்பு உலாவி -Name[te]=ప్రచురణ వ్యవస్థ బ్రౌజర్ -Name[tg]=Чопи тафсири система -Name[th]=เรียกดูระบบการพิมพ์ -Name[tr]=Yazdırma Sistemi Tarayıcı -Name[tt]=Bastıru Sistemen Küzätüçe -Name[uk]=Навігація системи друку -Name[uz]=Bosib chiqarish tizim brauzeri -Name[uz@cyrillic]=Босиб чиқариш тизим браузери -Name[ven]=Buronza ya maitele au phirintha -Name[vi]=Duyệt Hệ thống In ấn -Name[wa]=Foyteuse do sistinme d' imprimaedje -Name[xh]=Shicilela Umkhangeli zincwadi Wendlela -Name[zh_CN]=打印系统浏览器 -Name[zh_TW]=列印系統瀏覽器 -Name[zu]=Umcingi wesistimu yokushicilela Open=false X-TDE-TreeModule=Directory diff --git a/konqueror/sidebar/trees/init/services/settings.desktop b/konqueror/sidebar/trees/init/services/settings.desktop index 6b08b316e..5c4e71e65 100644 --- a/konqueror/sidebar/trees/init/services/settings.desktop +++ b/konqueror/sidebar/trees/init/services/settings.desktop @@ -3,79 +3,6 @@ Type=Link URL=settings:/ Icon=kcontrol Name=Settings -Name[af]=Instellings -Name[ar]=التعيينات -Name[az]=Qurğular -Name[be]=Настаўленні -Name[bg]=Настройки -Name[bn]=সেটিংস -Name[br]=Dibarzhoù -Name[bs]=Postavke -Name[ca]=Preferències -Name[cs]=Nastavení -Name[csb]=Ùstôw -Name[cy]=Gosodiadau -Name[da]=Opsætning -Name[de]=Einstellungen -Name[el]=Ρυθμίσεις -Name[eo]=Agordo -Name[es]=Preferencias -Name[et]=Seadistused -Name[eu]=Ezarpenak -Name[fa]=تنظیمات -Name[fi]=Asetukset -Name[fr]=Configuration -Name[fy]=Ynstellings -Name[ga]=Socruithe -Name[gl]=Opcións -Name[he]=הגדרות -Name[hi]=विन्यास -Name[hr]=Postavke -Name[hsb]=Nastajenja -Name[hu]=Beállítások -Name[is]=Stillingar -Name[it]=Impostazioni -Name[ja]=設定 -Name[ka]=პარამეტრები -Name[kk]=Параметрлері -Name[km]=ការកំណត់ -Name[ko]=설정 -Name[lt]=Parinktys -Name[lv]=Parametri -Name[mk]=Поставувања -Name[mn]=Тохируулга -Name[ms]=Tempatan -Name[nb]=Innstillinger -Name[nds]=Instellen -Name[ne]=सेटिङ -Name[nl]=Instellingen -Name[nn]=Innstillingar -Name[pa]=ਸੈਟਿੰਗ -Name[pl]=Ustawienia -Name[pt]=Configuração -Name[pt_BR]=Configurações -Name[ro]=Setări -Name[ru]=Настройка -Name[rw]=Amagenamiterere -Name[se]=Heivehusat -Name[sk]=Nastavenia -Name[sl]=Nastavitve -Name[sr]=Поставке -Name[sr@Latn]=Postavke -Name[sv]=Inställningar -Name[ta]=அமைப்புகள் -Name[te]=అమరికలు -Name[tg]=Танзимот -Name[th]=ตั้งค่าต่างๆ -Name[tr]=Ayarlar -Name[tt]=Caylaw -Name[uk]=Параметри -Name[uz]=Moslamalar -Name[uz@cyrillic]=Мосламалар -Name[vi]=Thiết lập -Name[wa]=Apontiaedjes -Name[zh_CN]=设置 -Name[zh_TW]=設定 Open=false X-TDE-TreeModule=Directory X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/konqueror/sidebar/trees/init/system.desktop b/konqueror/sidebar/trees/init/system.desktop index 8b73e0905..ed3d8f0d9 100644 --- a/konqueror/sidebar/trees/init/system.desktop +++ b/konqueror/sidebar/trees/init/system.desktop @@ -2,139 +2,10 @@ Type=Link URL=system:/ Icon=computer + Name=System -Name[af]=Stelsel -Name[ar]=النظام -Name[az]=Sistem -Name[be]=Сістэма -Name[bg]=Система -Name[bn]=সিস্টেম -Name[br]=Reizhiad -Name[bs]=Sistem -Name[ca]=Sistema -Name[cs]=Systém -Name[csb]=Systema -Name[cy]=Cysawd -Name[el]=Σύστημα -Name[eo]=Sistemo -Name[es]=Sistema -Name[et]=Süsteem -Name[eu]=Sistema -Name[fa]=سیستم -Name[fi]=Järjestelmä -Name[fo]=Kervi -Name[fr]=Système -Name[fy]=Systeem -Name[ga]=Córas -Name[gl]=Sistema -Name[he]=מערכת -Name[hi]=तंत्र -Name[hr]=Sustav -Name[hu]=Rendszer -Name[id]=Sistem -Name[is]=Kerfi -Name[it]=Sistema -Name[ja]=システム -Name[ka]=სისტემა -Name[kk]=Жүйелік -Name[km]=ប្រព័ន្ធ -Name[ko]=시스템 -Name[lo]=ຈັດການລະບົບ -Name[lt]=Sistema -Name[lv]=Sistēma -Name[mk]=Систем -Name[mn]=Систем -Name[ms]=Sistem -Name[mt]=Sistema -Name[nds]=Systeem -Name[ne]=प्रणाली -Name[nl]=Systeem -Name[oc]=Sistemo -Name[pa]=ਸਿਸਟਮ -Name[pt]=Sistema -Name[pt_BR]=Sistema -Name[ro]=Sistem -Name[ru]=Система -Name[rw]=Sisitemu -Name[se]=Vuogádat -Name[sk]=Systém -Name[sl]=Sistem -Name[sr]=Систем -Name[sr@Latn]=Sistem -Name[ss]=Umshini -Name[ta]=அமைப்பு -Name[te]=వ్యవస్థ -Name[tg]=Система -Name[th]=ระบบ -Name[tr]=Sistem -Name[tt]=Sistem -Name[uk]=Система -Name[uz]=Tizim -Name[uz@cyrillic]=Тизим -Name[ven]=Maitele -Name[vi]=Hệ thống -Name[wa]=Sistinme -Name[xh]=Indlela esestyenziswayo -Name[zh_CN]=系统 -Name[zh_TW]=系統 -Name[zu]=Isistimu Comment=This folder allows you to access common places on your computer -Comment[af]=Hierdie gids laat jou toe om algemene plekke op jou rekenaar te besoek -Comment[ar]=هذا المجلّد يسمح لك بالوصول إلى مواقع مشتركة على حاسوبك -Comment[be]=Гэтая тэчка дазваляе атрымаць хуткі доступ да розных важных месцаў на вашым кампутары -Comment[bg]=Директория за достъп до често използваните места в компютъра -Comment[bn]=এই ফোল্ডারটি আপনার কম্পিউটারে সাধারণত ব্যবহৃত অবস্থানগুলিতে চটপট চলে যেতে সাহায্য করে -Comment[bs]=Ovaj direktorij vam omogućuje pristup uobičajenim mjestima na vašem računaru -Comment[ca]=Aquesta carpeta us permet accedir a llocs usuals de l'ordinador -Comment[cs]=Tato složka zpřístupňuje často používaná umístění na vašem počítači -Comment[csb]=Nen katalog dôwô mòżnotã przistãpù do nôczãsczi brëkòwónëch placów w twòjim kòmpùtrze -Comment[da]=Denne mappe giver adgang til almindelige steder på din computer -Comment[de]=Dieser Ordner ermöglicht den Zugriff auf gebräuchliche Systembereiche des Rechners -Comment[el]=Αυτός ο φάκελος σας επιτρέπει την πρόσβαση σε τυπικές τοποθεσίες του συστήματός σας -Comment[eo]=Tiu ĉi dosierujo atingebligas al viaj ofte vizititaj lokoj en via komputilo -Comment[es]=Esta carpeta permite acceder a lugares usuales en su equipo -Comment[et]=See kataloog võimaldab juurdepääsu tavalistele kohtadele su arvutis -Comment[eu]=Karpeta honek zure ordenagailuaren leku arruntetarako sarbidea ematen dizu -Comment[fa]=این پوشه اجازۀ دستیابی به جاهای مشترک در رایانۀ شما را میدهد -Comment[fi]=Tämä kansio sallii pääsyn tietokoneesi yleisiin kohteisiin -Comment[fr]=Ce dossier vous permet d'accéder aux endroits de votre ordinateur régulièrement utilisés -Comment[fy]=Dizze map jout tagong ta algemiene plakken yn jo kompjûter -Comment[ga]=Ceadaíonn an fillteán seo duit áiteanna coitianta a rochtain ar do ríomhaire -Comment[gl]=Este cartafol permite-lle aceder a lugares habituais do seu ordenador -Comment[he]=תיקייה זו מאפשרת לך לגשת את המקומות המועדפים עליך במערכת שלך -Comment[hr]=Ova mapa omogućuje pristup uobičajenim lokacijama na računalu -Comment[hu]=Néhány fontosabb rendszerkönyvtár elérését teszi lehetővé -Comment[is]=Þessi mappa veitir aðgang að algengum stöðum á tölvunni þinni -Comment[it]=Questa cartella permette di accedere agli oggetti comuni del tuo computer -Comment[ja]=このフォルダからコンピュータ上のよく使われる場所にアクセスできます -Comment[kk]=Бұл қапшық компьютердегі ортақ орындарға қатынауға мүмкіндік береді -Comment[km]=ថតនេះអនុញ្ញាតឲ្យអ្នកចូលដំណើរការកន្លែងទូទៅលើកុំព្យូទ័ររបស់អ្នក -Comment[lt]=Šio aplanko padedami pasieksite dažniausiai lankomas kompiuterio vietas -Comment[mk]=Оваа папка ви овозможува пристап до вообичаените места на вашиот компјутер -Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datamaskin -Comment[nds]=Mit dissen Orner kannst Du op en Reeg faken bruukte Öörd togriepen -Comment[ne]=यो फोल्डरले तपाईँलाई कम्प्युटरको साझा स्थानहरूमा पहुँच अनुमति दिन्छ -Comment[nl]=Deze map geeft toegang tot algemene plekken van uw desktop -Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datamaskina -Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ 'ਚ ਆਮ ਥਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ -Comment[pl]=Ten folder umożliwia dostęp do najczęściej używanych miejsc w Twoim komputerze -Comment[pt]=Esta pasta permite aceder a alguns locais comuns no seu computador -Comment[pt_BR]=Esta pasta permite que você acesse lugares comuns em seu computador -Comment[ro]=Acest folder vă permite să accesați locurile uzuale pe computerul dvs. -Comment[ru]=Часто используемые папки -Comment[sk]=Tento priečinok umožňuje pristupovať na spoločné miesta na tomto počítači -Comment[sl]=Ta mapa omogoča dostop do pomembnih lokacij na vašem računalniku -Comment[sr]=Ова фасцикла омогућава приступ уобичајеним местима на вашем рачунару -Comment[sr@Latn]=Ova fascikla omogućava pristup uobičajenim mestima na vašem računaru -Comment[sv]=Den här katalogen gör det möjligt att komma åt vanliga platser på din dator -Comment[th]=โฟลเดอร์นี้อนุญาตให้คุณเข้าถึงสถานที่ทั่วๆ ไปในเครื่องคอมพิวเตอร์ของคุณ -Comment[tr]=Bu klasör bilgisayarınızdaki belirli yerlere erişmenizi sağlar -Comment[uk]=Ця тека надає доступ до спільних місць у вашому комп'ютері -Comment[vi]=Thư mục này cho phép bạn truy cập vào các nơi thông dụng của máy tính -Comment[wa]=Ci ridant chal vos permete d' aler ås comonès plaeces so vosse copiutrece -Comment[zh_CN]=此文件夹允许您访问计算机中的公共位置 -Comment[zh_TW]=這個資料夾允許存取您電腦上的共同空間 Open=true X-TDE-TreeModule=Directory diff --git a/konqueror/sidebar/trees/init/trash.desktop b/konqueror/sidebar/trees/init/trash.desktop index abf4770e9..796894d90 100644 --- a/konqueror/sidebar/trees/init/trash.desktop +++ b/konqueror/sidebar/trees/init/trash.desktop @@ -7,17 +7,5 @@ X-TDE-TreeModule=Directory X-TDE-KonqSidebarModule=konqsidebar_tree Name=Trash Folder -Name[de]=Mülleimer -Name[cs]=Složka koše -Name[es]=Papelera -Name[fr]=Dossier Corbeille -Name[it]=Cartella Cestino -Name[ru]=Корзина Comment=This folder displays the contents of your Trash Bin -Comment[cs]=Tato složka zobrazuje obsah vašeho koše -Comment[de]=Dieser Ordner zeigt Ihnen den Inhalt Ihres Mülleimers an -Comment[es]=Esta carpeta muestra el contenido de tu papelera -Comment[fr]=Ce dossier montre le contenu de votre corbeille -Comment[it]=Questa cartella visualizza il contenuto del tuo Cestino -Comment[ru]=Данная папка показывает содержание вашей корзины diff --git a/konqueror/sidebar/trees/init/virtualfolderadd.desktop b/konqueror/sidebar/trees/init/virtualfolderadd.desktop index fbbb076d6..ec33a628c 100644 --- a/konqueror/sidebar/trees/init/virtualfolderadd.desktop +++ b/konqueror/sidebar/trees/init/virtualfolderadd.desktop @@ -2,78 +2,8 @@ Type=Link URL= Icon=folder + Name=Folder -Name[af]=Gids -Name[ar]=المجلد -Name[az]=Qovluq -Name[be]=Тэчка -Name[bg]=Директория -Name[bn]=ফোল্ডার -Name[br]=Renkell -Name[bs]=Direktorij -Name[ca]=Carpeta -Name[cs]=Složka -Name[csb]=Katalog -Name[cy]=Plygell -Name[da]=Mappe -Name[de]=Ordner -Name[el]=Φάκελος -Name[eo]=Dosierujo -Name[es]=Carpeta -Name[et]=Kataloog -Name[eu]=Karpeta -Name[fa]=پوشه -Name[fi]=Kansio -Name[fr]=Dossier -Name[fy]=Map -Name[ga]=Fillteán -Name[gl]=Cartafol -Name[he]=תיקייה -Name[hi]=फ़ोल्डर -Name[hr]=Mapa -Name[hu]=Könyvtár -Name[is]=Mappa -Name[it]=Cartella -Name[ja]=フォルダ -Name[ka]=საქაღალდე -Name[kk]=Қапшық -Name[km]=ថត -Name[ko]=홈 폴더 -Name[lt]=Aplankas -Name[lv]=Mape -Name[mk]=Папка -Name[mn]=хавтас -Name[mt]=Direttorju -Name[nb]=Mappe -Name[nds]=Orner -Name[ne]=फोल्डर -Name[nl]=Map -Name[nn]=Mappe -Name[pa]=ਫੋਲਡਰ -Name[pl]=Katalog -Name[pt]=Pasta -Name[pt_BR]=Pasta -Name[ru]=Папка -Name[rw]=Ububiko -Name[se]=Máhppa -Name[sk]=Priečinok -Name[sl]=Mapa -Name[sr]=Фасцикла -Name[sr@Latn]=Fascikla -Name[sv]=Katalog -Name[ta]=அடைவு -Name[te]=ఫొల్డర్ -Name[tg]=Феҳрист -Name[th]=โฟลเดอร์ -Name[tr]=Dizin -Name[tt]=Törgäk -Name[uk]=Тека -Name[uz]=Jild -Name[uz@cyrillic]=Жилд -Name[vi]=Thư mục -Name[wa]=Ridant -Name[zh_CN]=文件夹 -Name[zh_TW]=資料夾 Open=false X-TDE-KonqSidebarAddParam= diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 514c28095..6dee8c0dd 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -136,8 +136,8 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg m_part = parent; m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAnimation() ) ); + connect( m_animationTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; @@ -148,22 +148,22 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg setTreeStepSize(15); m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); - - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); + + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); /* assert( m_part->getInterfaces()->getInstance()->dirs ); TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */ @@ -483,7 +483,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item ) void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col ) { KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item ); - if (_button == Qt::RightButton) + if (_button == TQt::RightButton) { if ( item && col < 2) { @@ -502,10 +502,10 @@ void KonqSidebarTree::slotSidebarMouseButtonClicked(int _button, TQListViewItem* if(_item && col < 2) { switch( _button ) { - case Qt::LeftButton: + case TQt::LeftButton: slotExecuted( item ); break; - case Qt::MidButton: + case TQt::MidButton: item->middleButtonClicked(); break; } @@ -558,7 +558,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir ) kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl; if ( m_dirtreeDir.dir.isParentOf( dir ) ) // We use a timer in case of DCOP re-entrance.. - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); } void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) @@ -569,7 +569,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) //kdDebug(1201) << "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl; if ( m_dirtreeDir.dir.isParentOf( *it ) ) { - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl; return; } @@ -908,22 +908,22 @@ void KonqSidebarTree::showToplevelContextMenu() if (!m_collection) { m_collection = new TDEActionCollection( this, "bookmark actions" ); - (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotRename() ), m_collection, "rename"); - (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotDelete() ), m_collection, "delete_link"); - (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this, + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); + (void) new TDEAction( i18n("Rename"), 0, this, + TQ_SLOT( slotRename() ), m_collection, "rename"); + (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this, + TQ_SLOT( slotDelete() ), m_collection, "delete_link"); + (void) new TDEAction( i18n("Properties"), "edit", 0, this, + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); + (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); + (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } TQPopupMenu *menu = new TQPopupMenu; @@ -1012,7 +1012,6 @@ void KonqSidebarTree::slotProperties() KPropertiesDialog *dlg = new KPropertiesDialog( url ); dlg->setFileNameReadOnly(true); dlg->exec(); - delete dlg; } void KonqSidebarTree::slotOpenNewWindow() diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index 703a256c9..f76027481 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -75,7 +75,7 @@ typedef enum { */ class KonqSidebarTree : public TDEListView, public KDirNotify { - Q_OBJECT + TQ_OBJECT public: KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ); virtual ~KonqSidebarTree(); diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 1903c2328..4bd91f9f3 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -34,25 +34,25 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); } else tree=new KonqSidebarTree(this,widget,virt,desktopName_); - connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(tree, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(tree,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); - connect(tree,TQT_SIGNAL(enableAction( const char *, bool )), - this,TQT_SIGNAL(enableAction( const char *, bool))); + connect(tree,TQ_SIGNAL(enableAction( const char *, bool )), + this,TQ_SIGNAL(enableAction( const char *, bool))); } diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index bdc58ad0c..25b616bd6 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -16,7 +16,7 @@ class TQVBox; class KonqSidebar_Tree: public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_Tree(); diff --git a/konqueror/sidebar/web_module/CMakeLists.txt b/konqueror/sidebar/web_module/CMakeLists.txt index a15866ebd..9d295e22e 100644 --- a/konqueror/sidebar/web_module/CMakeLists.txt +++ b/konqueror/sidebar/web_module/CMakeLists.txt @@ -25,7 +25,11 @@ link_directories( ##### other data ################################ -install( FILES webmodule_add.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add ) +tde_create_translated_desktop( + SOURCE webmodule_add.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add + PO_DIR konqueror-desktops +) install( FILES websidebar.html DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/websidebar ) diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index 44a94f02c..feb1a6692 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -36,30 +36,30 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare : KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name) { _htmlPart = new TDEHTMLSideBar(universalMode()); - connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload())); - connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded())); + connect(_htmlPart, TQ_SIGNAL(reload()), this, TQ_SLOT(reload())); + connect(_htmlPart, TQ_SIGNAL(completed()), this, TQ_SLOT(pageLoaded())); connect(_htmlPart, - TQT_SIGNAL(setWindowCaption(const TQString&)), + TQ_SIGNAL(setWindowCaption(const TQString&)), this, - TQT_SLOT(setTitle(const TQString&))); + TQ_SLOT(setTitle(const TQString&))); connect(_htmlPart, - TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), + TQ_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), this, - TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs))); + TQ_SLOT(urlClicked(const TQString&, KParts::URLArgs))); connect(_htmlPart->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, - TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); + TQ_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); connect(_htmlPart, - TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() )); + TQ_SIGNAL(setAutoReload()), this, TQ_SLOT( setAutoReload() )); connect(_htmlPart, - TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), + TQ_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), this, - TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); + TQ_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); connect(_htmlPart, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); _desktopName = desktopName; @@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare _url = ksc.readPathEntry("URL"); _htmlPart->openURL(_url ); // Must load this delayed - TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon())); + TQTimer::singleShot(0, this, TQ_SLOT(loadFavicon())); } @@ -176,7 +176,7 @@ void KonqSideBarWebModule::setTitle(const TQString& title) { void KonqSideBarWebModule::pageLoaded() { if( reloadTimeout > 0 ) { - TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) ); + TQTimer::singleShot( reloadTimeout, this, TQ_SLOT( reload() ) ); } } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 938677d8d..072c3d822 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -31,7 +31,7 @@ // A wrapper for TDEHTMLPart to make it behave the way we want it to. class TDEHTMLSideBar : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: TDEHTMLSideBar(bool universal) : TDEHTMLPart() { setStatusMessagesEnabled(false); @@ -41,9 +41,9 @@ class TDEHTMLSideBar : public TDEHTMLPart setFormNotification(TDEHTMLPart::Only); connect(this, - TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) + TQ_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) ); @@ -51,22 +51,22 @@ class TDEHTMLSideBar : public TDEHTMLPart "link context menu"); if (!universal) { _linkMenu->insertItem(i18n("&Open Link"), - this, TQT_SLOT(loadPage())); + this, TQ_SLOT(loadPage())); _linkMenu->insertItem(i18n("Open in New &Window"), - this, TQT_SLOT(loadNewWindow())); + this, TQ_SLOT(loadNewWindow())); } else { _linkMenu->insertItem(i18n("Open in New &Window"), - this, TQT_SLOT(loadPage())); + this, TQ_SLOT(loadPage())); } _menu = new TDEPopupMenu(widget(), "context menu"); _menu->insertItem(SmallIcon("reload"), i18n("&Reload"), - this, TQT_SIGNAL(reload())); - _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload())); + this, TQ_SIGNAL(reload())); + _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQ_SIGNAL(setAutoReload())); connect(this, - TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)), + TQ_SIGNAL(popupMenu(const TQString&,const TQPoint&)), this, - TQT_SLOT(showMenu(const TQString&, const TQPoint&))); + TQ_SLOT(showMenu(const TQString&, const TQPoint&))); } virtual ~TDEHTMLSideBar() {} @@ -82,7 +82,7 @@ class TDEHTMLSideBar : public TDEHTMLPart virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs()) { - if (button == Qt::LeftButton ){ + if (button == TQt::LeftButton ){ if (_target.lower() == "_self") { openURL(url); } else if (_target.lower() == "_blank") { @@ -92,7 +92,7 @@ class TDEHTMLSideBar : public TDEHTMLPart } return; } - if (button == Qt::MidButton) { + if (button == TQt::MidButton) { emit openURLNewWindow(completeURL(url).url(), args); return; @@ -164,7 +164,7 @@ class TDEHTMLSideBar : public TDEHTMLPart class KonqSideBarWebModule : public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, diff --git a/konqueror/sidebar/web_module/webmodule_add.desktop b/konqueror/sidebar/web_module/webmodule_add.desktop index a42601c88..6621f8b75 100644 --- a/konqueror/sidebar/web_module/webmodule_add.desktop +++ b/konqueror/sidebar/web_module/webmodule_add.desktop @@ -3,77 +3,6 @@ Type=Link URL= Icon=www Name=Web SideBar Module -Name[af]=Web kantbalk module -Name[ar]=وحدة شريط الشبكة الجانبي -Name[az]=Veb Yan Çubuq Modulu -Name[be]=Модуль cеціўнай бакавой панэлі -Name[bg]=Модул за страничния панел на браузъра -Name[bn]=ওয়েব সাইডবার মডিউল -Name[bs]=Web sidebar modul -Name[ca]=Mòdul web SideBar -Name[cs]=Webový postranní panel -Name[csb]=Moduł bòczny lëstwë WWW -Name[cy]=Modiwl Bar Ochr Gwe -Name[da]=Web-sidebjælke modul -Name[de]=Web-Navigationsbereich -Name[el]=Άρθρωμα πλευρικής μπάρας Ιστού -Name[eo]=TTT-flankzona modulo -Name[es]=Módulo de la barra lateral de web -Name[et]=Veebi külgriba moodul -Name[eu]=Web-eko alboko barraren modulua -Name[fa]=پیمانۀ میله جانبی وب -Name[fi]=Verkkosivupalkkimoduuli -Name[fr]=Module de barre de navigation sur le web -Name[fy]=Web sydbalke module -Name[ga]=Modúl Barra Taoibh Gréasáin -Name[gl]=Módulo da Barra Lateral Web -Name[he]=מודול שורת־צד מקוון -Name[hi]=वेब बाज़ूपट्टी मॉड्यूल -Name[hr]=Modul za web trake -Name[hu]=Webes oldalsáv-modul -Name[is]=Vefhliðarslá -Name[it]=Modulo barra laterale web -Name[ja]=ウェブサイドバーモジュール -Name[ka]=გვერდით Web დაფის მოდული -Name[kk]=Веб бүйір панель модулі -Name[km]=ម៉ូឌុលរបារបណ្ដាញ -Name[ko]=웹 사이드바 모듈 -Name[lt]=Šoninės žiniatinklio juostos modulis -Name[lv]=Tīmekļa sānjoslas modulis -Name[mk]=Модул - Веб-странична лента -Name[mn]=Вэб самбарын модул -Name[ms]=Modul Bar Sisi Web -Name[mt]=Barra tal-ġenb għal-web -Name[nb]=Modul for nett-sidestolpe -Name[nds]=Sietpaneel för de Nettnavigatschoon -Name[ne]=वेब छेउपट्टी मोड्युल -Name[nl]=Webzijbalkmodule -Name[nn]=Modul for nett-sidestolpe -Name[pa]=ਵੈੱਬ ਬਾਹੀ ਮੈਡੀਊਲ -Name[pl]=Moduł paska bocznego WWW -Name[pt]=Módulo da Barra Lateral Web -Name[pt_BR]=Módulo da Barra Lateral Web -Name[ro]=Modul bară laterală web -Name[ru]=Модуль боковой панели Web -Name[rw]=Igice UmurongokuRuahande cy'Urubugamakuru -Name[se]=Neahtta-bálddalasholga moduvla -Name[sk]=Modul bočného Web panelu -Name[sl]=Modul spletne stranske vrstice -Name[sr]=Модул веб бочне траке -Name[sr@Latn]=Modul veb bočne trake -Name[sv]=Webbsidoradsmodul -Name[ta]=வலை பக்கப்பட்டி பகுதி -Name[tg]=Бахши навори канораи вэб -Name[th]=โมดูลแถบด้านข้างสำหรับเว็บ -Name[tr]=Web Yan Çubuk Modülü -Name[tt]=Web YanTirä Modulı -Name[uk]=Модуль бічної панелі Тенет -Name[uz]=Veb yon paneli moduli -Name[uz@cyrillic]=Веб ён панели модули -Name[vi]=Mô đun Thanh bên Trình duyệt -Name[wa]=Module di bår di costé waibe -Name[zh_CN]=Web 侧边栏模块 -Name[zh_TW]=網頁邊列模組 Open=false X-TDE-KonqSidebarAddModule=konqsidebar_web X-TDE-KonqSidebarUniversal=true diff --git a/konqueror/sidebar/web_module/websidebar.desktop b/konqueror/sidebar/web_module/websidebar.desktop index 8a245e188..aab4127fc 100644 --- a/konqueror/sidebar/web_module/websidebar.desktop +++ b/konqueror/sidebar/web_module/websidebar.desktop @@ -3,76 +3,5 @@ Type=Link URL= Icon=www Name=Web SideBar Module -Name[af]=Web kantbalk module -Name[ar]=وحدة شريط الشبكة الجانبي -Name[az]=Veb Yan Çubuq Modulu -Name[be]=Модуль cеціўнай бакавой панэлі -Name[bg]=Модул за страничния панел на браузъра -Name[bn]=ওয়েব সাইডবার মডিউল -Name[bs]=Web sidebar modul -Name[ca]=Mòdul web SideBar -Name[cs]=Webový postranní panel -Name[csb]=Moduł bòczny lëstwë WWW -Name[cy]=Modiwl Bar Ochr Gwe -Name[da]=Web-sidebjælke modul -Name[de]=Web-Navigationsbereich -Name[el]=Άρθρωμα πλευρικής μπάρας Ιστού -Name[eo]=TTT-flankzona modulo -Name[es]=Módulo de la barra lateral de web -Name[et]=Veebi külgriba moodul -Name[eu]=Web-eko alboko barraren modulua -Name[fa]=پیمانۀ میله جانبی وب -Name[fi]=Verkkosivupalkkimoduuli -Name[fr]=Module de barre de navigation sur le web -Name[fy]=Web sydbalke module -Name[ga]=Modúl Barra Taoibh Gréasáin -Name[gl]=Módulo da Barra Lateral Web -Name[he]=מודול שורת־צד מקוון -Name[hi]=वेब बाज़ूपट्टी मॉड्यूल -Name[hr]=Modul za web trake -Name[hu]=Webes oldalsáv-modul -Name[is]=Vefhliðarslá -Name[it]=Modulo barra laterale web -Name[ja]=ウェブサイドバーモジュール -Name[ka]=გვერდით Web დაფის მოდული -Name[kk]=Веб бүйір панель модулі -Name[km]=ម៉ូឌុលរបារបណ្ដាញ -Name[ko]=웹 사이드바 모듈 -Name[lt]=Šoninės žiniatinklio juostos modulis -Name[lv]=Tīmekļa sānjoslas modulis -Name[mk]=Модул - Веб-странична лента -Name[mn]=Вэб самбарын модул -Name[ms]=Modul Bar Sisi Web -Name[mt]=Barra tal-ġenb għal-web -Name[nb]=Modul for nett-sidestolpe -Name[nds]=Sietpaneel för de Nettnavigatschoon -Name[ne]=वेब छेउपट्टी मोड्युल -Name[nl]=Webzijbalkmodule -Name[nn]=Modul for nett-sidestolpe -Name[pa]=ਵੈੱਬ ਬਾਹੀ ਮੈਡੀਊਲ -Name[pl]=Moduł paska bocznego WWW -Name[pt]=Módulo da Barra Lateral Web -Name[pt_BR]=Módulo da Barra Lateral Web -Name[ro]=Modul bară laterală web -Name[ru]=Модуль боковой панели Web -Name[rw]=Igice UmurongokuRuahande cy'Urubugamakuru -Name[se]=Neahtta-bálddalasholga moduvla -Name[sk]=Modul bočného Web panelu -Name[sl]=Modul spletne stranske vrstice -Name[sr]=Модул веб бочне траке -Name[sr@Latn]=Modul veb bočne trake -Name[sv]=Webbsidoradsmodul -Name[ta]=வலை பக்கப்பட்டி பகுதி -Name[tg]=Бахши навори канораи вэб -Name[th]=โมดูลแถบด้านข้างสำหรับเว็บ -Name[tr]=Web Yan Çubuk Modülü -Name[tt]=Web YanTirä Modulı -Name[uk]=Модуль бічної панелі Тенет -Name[uz]=Veb yon paneli moduli -Name[uz@cyrillic]=Веб ён панели модули -Name[vi]=Mô đun Thanh bên Trình duyệt -Name[wa]=Module di bår di costé waibe -Name[zh_CN]=Web 侧边栏模块 -Name[zh_TW]=網頁邊列模組 Open=false X-TDE-KonqSidebarModule=konqsidebar_web |