mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 08:51:24 +00:00
* Show Names in the View mode menu (instead of Comments)
* Changed comments into names for konqueror's directory views, for the above. Scripted kde-i18n's desktop.po files to follow this change. * Update View mode menu when the service type changes and the service doesn't (fixes #12428). Made a separate method KonqFactory::getOffers for that. svn path=/trunk/kdebase/konqueror/; revision=66963
This commit is contained in:
parent
f444c74c44
commit
60bd61bcba
|
@ -1,27 +1,40 @@
|
|||
[Desktop Entry]
|
||||
Type=Service
|
||||
Exec=blahfoo
|
||||
Comment=Directory Tree
|
||||
Comment[ca]=Arbre de directoris
|
||||
Comment[cs]=Adresářový strom
|
||||
Comment[de]=Verzeichnisbaum
|
||||
Comment[eo]=Dosierujo-arbo
|
||||
Comment[et]=Kataloogi puu
|
||||
Comment[fi]=Hakemistopuu
|
||||
Comment[he]=תוירפס ץע
|
||||
Comment[hu]=Könyvtárfa
|
||||
Comment[it]=Albero delle directory
|
||||
Comment[ja]=ディレクトリツリー
|
||||
Comment[nl]=Mappen-boomstructuur
|
||||
Comment[no]=Katalogtre
|
||||
Comment[no_NY]=Katalogtre
|
||||
Comment[pt]=Árvore de Directorios
|
||||
Comment[ro]=Arbore de directoare
|
||||
Comment[sl]=Drevo imenikov
|
||||
Comment[sv]=Katalogträd
|
||||
Comment[ta]=அைடவ மரம
|
||||
Comment[tr]=Dizin Aðacý
|
||||
Name=KonqDirTree
|
||||
Name=Directory Tree
|
||||
Name[ca]=Arbre de directoris
|
||||
Name[cs]=Adresářový strom
|
||||
Name[da]=Mappetræ
|
||||
Name[de]=Verzeichnisbaum
|
||||
Name[el]=Δέντρο Καταλόγων
|
||||
Name[eo]=Dosierujo-arbo
|
||||
Name[es]=Ãrbol de directorios
|
||||
Name[et]=Kataloogi puu
|
||||
Name[fi]=Hakemistopuu
|
||||
Name[fr]=l'arborescence complète
|
||||
Name[gl]=Árbore de Directorios
|
||||
Name[he]=תוירפס ץע
|
||||
Name[hr]=Stablo direktorija
|
||||
Name[hu]=Könyvtárfa
|
||||
Name[is]=Möpputré
|
||||
Name[it]=Albero delle directory
|
||||
Name[ja]=ディレクトリツリー
|
||||
Name[mk]=Дрво на папки
|
||||
Name[nl]=Mappen-boomstructuur
|
||||
Name[no]=Katalogtre
|
||||
Name[no_NY]=Katalogtre
|
||||
Name[pl]=Drzewo katalogów
|
||||
Name[pt]=Árvore de Directorias
|
||||
Name[pt_BR]=Árvore de diretórios
|
||||
Name[ro]=Arbore de directoare
|
||||
Name[ru]=Дерево каталогов
|
||||
Name[sk]=Štruktúra Adresárov
|
||||
Name[sl]=Drevo imenikov
|
||||
Name[sr]=Stablo direktorijuma
|
||||
Name[sv]=Katalogträd
|
||||
Name[ta]=«¨¼× ÁÃõ
|
||||
Name[tr]=Dizin Ağacı
|
||||
Name[uk]=Структура каталогів
|
||||
Name[zh_CN.GB2312]=目录树
|
||||
MimeType=inode/directory
|
||||
ServiceTypes=KParts/ReadOnlyPart,Browser/View
|
||||
X-KDE-Library=libkonqdirtree
|
||||
|
|
|
@ -1,38 +1,42 @@
|
|||
[Desktop Entry]
|
||||
Type=Service
|
||||
Exec=blahfoo
|
||||
Comment=Icon View
|
||||
Comment[ca]=Vista d'icones
|
||||
Comment[cs]=Pohled s ikonami
|
||||
Comment[da]=Ikonvisning
|
||||
Comment[de]=Symbol-Ansicht
|
||||
Comment[eo]=Piktogramrigardo
|
||||
Comment[es]=Vista de Icono
|
||||
Comment[et]=Vaade ikoonidena
|
||||
Comment[fi]=Kuvakenäkymä
|
||||
Comment[fr]=Icônes
|
||||
Comment[he]=םילמס תגוצת
|
||||
Comment[hr]=Pregled ikona
|
||||
Comment[hu]=Ikonnézet
|
||||
Comment[is]=Táknmyndasýn
|
||||
Comment[it]=Vista a icone
|
||||
Comment[ja]=アイコンビュー
|
||||
Comment[mk]=Приказ со икони
|
||||
Comment[nl]=Pictogramweergave
|
||||
Comment[no]=Ikonvisning
|
||||
Comment[no_NY]=Ikon-vising
|
||||
Comment[pl]=Widok ikon
|
||||
Comment[pt]=Vista por icones
|
||||
Comment[pt_BR]=Visão em Ícones
|
||||
Comment[ro]=Vizualizare iconică
|
||||
Comment[ru]=Вид с писктограмами
|
||||
Comment[sl]=Ikoniziran pogled
|
||||
Comment[sr]=Pogled sa ikonicama
|
||||
Comment[ta]=குறுமஂபடமஂ காடஂசி
|
||||
Comment[tr]=Simge Görünümü
|
||||
Comment[uk]=Вигляд піктограммами
|
||||
Name=Icon View
|
||||
Name[ca]=Vista d'icones
|
||||
Name[cs]=Pohled s ikonami
|
||||
Name[da]=Ikonvisning
|
||||
Name[de]=Symbol-Ansicht
|
||||
Name[el]=Προβολή Εικονιδίων
|
||||
Name[eo]=Piktogramrigardo
|
||||
Name[es]=Vista de Icono
|
||||
Name[et]=Vaade ikoonidena
|
||||
Name[fi]=Kuvakenäkymä
|
||||
Name[fr]=Icônes
|
||||
Name[gl]=Vista con Iconas
|
||||
Name[he]=םילמס תגוצת
|
||||
Name[hr]=Pregled ikona
|
||||
Name[hu]=ikonnézet
|
||||
Name[is]=Táknmyndasýn
|
||||
Name[it]=Vista a icone
|
||||
Name[ja]=アイコンビュー
|
||||
Name[mk]=Приказ со икони
|
||||
Name[nl]=Pictogramweergave
|
||||
Name[no]=Ikonvisning
|
||||
Name[no_NY]=Ikon-vising
|
||||
Name[pl]=Widok ikon
|
||||
Name[pt]=Vista por icones
|
||||
Name[pt_BR]=Visão em Ícones
|
||||
Name[ro]=Vizualizare iconică
|
||||
Name[ru]=Вид с писктограмами
|
||||
Name[sk]=Prezerač Ikoniek
|
||||
Name[sl]=Ikoniziran pogled
|
||||
Name[sr]=Pogled sa ikonicama
|
||||
Name[sv]=Ikonvy
|
||||
Name[ta]=ÌÚõÀ¼õ ¸¡ðº¢
|
||||
Name[tr]=Simge Görünümü
|
||||
Name[uk]=Вигляд піктограммами
|
||||
Name[zh_CN.GB2312]=图标视图
|
||||
MimeType=inode/directory
|
||||
Name=KonqKfmIconView
|
||||
ServiceTypes=KParts/ReadOnlyPart,Browser/View
|
||||
X-KDE-Library=libkonqiconview
|
||||
X-KDE-BrowserView-AllowAsDefault=true
|
||||
|
|
|
@ -1,33 +1,40 @@
|
|||
[Desktop Entry]
|
||||
Type=Service
|
||||
Exec=blahfoo
|
||||
Comment=MultiColumn View
|
||||
Comment[ca]=Vista multicolumna
|
||||
Comment[cs]=Vícesloupcový pohled
|
||||
Comment[da]=Multisøjlevisning
|
||||
Comment[de]=Mehrspaltige Ansicht
|
||||
Comment[eo]=Multkolumna rigardo
|
||||
Comment[et]=Vaade mitme tulbana
|
||||
Comment[fi]=Monisarakenäkymä
|
||||
Comment[fr]=Multi-colonnes
|
||||
Comment[he]=המישר תגוצת
|
||||
Comment[hu]=Többoszlopos nézet
|
||||
Comment[it]=Vista a colonne multiple
|
||||
Comment[ja]=マルチコラムビュー
|
||||
Comment[mk]=Приказ во колони
|
||||
Comment[nl]=Multikolommenweergave
|
||||
Comment[no]=Flerkolonnevisning
|
||||
Comment[no_NY]=Multikolonne-vising
|
||||
Comment[pl]=Widok wielokolumnowy
|
||||
Comment[pt]=Vista por Multicolunas
|
||||
Comment[pt_BR]=Visão em multicolunas
|
||||
Comment[ru]=Многоколонный вид
|
||||
Comment[sl]=Večstolpčni pogled
|
||||
Comment[ta]=பலவரிைச காடஂசி
|
||||
Comment[tr]=Çoklu Sütun Görünümü
|
||||
Comment[uk]=Вигляд у багато стопчиків
|
||||
Name=MultiColumn View
|
||||
Name[ca]=Vista multicolumna
|
||||
Name[cs]=Vícesloupcový pohled
|
||||
Name[da]=Multisøjlevisning
|
||||
Name[de]=Mehrspaltige Ansicht
|
||||
Name[el]=Προβολή Πολλών Στηλών
|
||||
Name[eo]=Multkolumna rigardo
|
||||
Name[es]=Vista Multicolumna
|
||||
Name[et]=Vaade mitme tulbana
|
||||
Name[fi]=Monisarakenäkymä
|
||||
Name[fr]=Multi-colonnes
|
||||
Name[gl]=Vista con Múltiples columnas
|
||||
Name[he]=המישר תגוצת
|
||||
Name[hu]=többoszlopos nézet
|
||||
Name[is]=Dálkskipt sýn
|
||||
Name[it]=Vista a colonne multiple
|
||||
Name[ja]=マルチコラムビュー
|
||||
Name[mk]=Приказ во колони
|
||||
Name[nl]=Multikolommenweergave
|
||||
Name[no]=Flerkolonnevisning
|
||||
Name[no_NY]=Multikolonne-vising
|
||||
Name[pl]=Widok wielokolumnowy
|
||||
Name[pt]=Vista por Multicolunas
|
||||
Name[pt_BR]=Visão em multicolunas
|
||||
Name[ro]=Vizualizare multicoloană
|
||||
Name[ru]=Многоколонный вид
|
||||
Name[sk]=MultiStĺpcový pohľad
|
||||
Name[sl]=Večstolpčni pogled
|
||||
Name[sr]=Pogled sa više kolona
|
||||
Name[sv]=Flerkolumnsvy
|
||||
Name[tr]=Çoklu Sütun Görünümü
|
||||
Name[uk]=Вигляд у багато стопчиків
|
||||
Name[zh_CN.GB2312]=多列视图
|
||||
MimeType=inode/directory
|
||||
Name=KonqMultiColumnView
|
||||
ServiceTypes=KParts/ReadOnlyPart,Browser/View
|
||||
X-KDE-Library=libkonqiconview
|
||||
X-KDE-BrowserView-AllowAsDefault=true
|
||||
|
|
|
@ -99,52 +99,31 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
|
|||
}
|
||||
}
|
||||
|
||||
KTrader::OfferList offers = KTrader::self()->query( serviceType );
|
||||
// We need to get those in any case
|
||||
KTrader::OfferList offers;
|
||||
|
||||
if ( appServiceOffers )
|
||||
{
|
||||
*appServiceOffers = offers;
|
||||
KTrader::OfferList::Iterator it = appServiceOffers->begin();
|
||||
while ( it != appServiceOffers->end() )
|
||||
{
|
||||
//kdDebug(1202) << (*it)->desktopEntryName() << endl;
|
||||
// Remove pure services (no app), and also remove ourselves... :-}
|
||||
if ( (*it)->type() != "Application"
|
||||
|| (*it)->desktopEntryName() == "kfmclient" )
|
||||
{
|
||||
it = appServiceOffers->remove( it );
|
||||
// it points to the next one now
|
||||
}
|
||||
else
|
||||
++it;
|
||||
}
|
||||
}
|
||||
// Query the trader
|
||||
getOffers( serviceType, &offers, appServiceOffers );
|
||||
|
||||
if ( partServiceOffers )
|
||||
(*partServiceOffers) = offers;
|
||||
|
||||
KService::Ptr service = 0L;
|
||||
KTrader::OfferList::Iterator it = offers.begin();
|
||||
// Remove irrelevant entries (non parts) and while we're at it, check for serviceName
|
||||
while ( it != offers.end() )
|
||||
|
||||
// Look for this service
|
||||
if ( !serviceName.isEmpty() )
|
||||
{
|
||||
QStringList serviceTypes = (*it)->serviceTypes();
|
||||
if ( !serviceTypes.contains( "KParts/ReadOnlyPart" ) && !serviceTypes.contains( "Browser/View" ) )
|
||||
{
|
||||
//kdDebug(1202) << "Service " << (*it)->name() << " not embeddable" << endl;
|
||||
it = offers.remove( it );
|
||||
// it points to the next one now
|
||||
continue;
|
||||
}
|
||||
if ( !service && !serviceName.isEmpty() )
|
||||
{
|
||||
if ( (*it)->desktopEntryName() == serviceName )
|
||||
KTrader::OfferList::Iterator it = offers.begin();
|
||||
// Remove irrelevant entries (non parts)
|
||||
for ( ; it != offers.end() && !service ; ++it )
|
||||
{
|
||||
kdDebug(1202) << "Found requested service " << serviceName << endl;
|
||||
service = *it;
|
||||
if ( (*it)->desktopEntryName() == serviceName )
|
||||
{
|
||||
kdDebug(1202) << "Found requested service " << serviceName << endl;
|
||||
service = *it;
|
||||
}
|
||||
}
|
||||
}
|
||||
++it;
|
||||
}
|
||||
if ( partServiceOffers )
|
||||
(*partServiceOffers) = offers;
|
||||
|
||||
KLibFactory *factory = 0L;
|
||||
|
||||
|
@ -154,7 +133,7 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
|
|||
factory = KLibLoader::self()->factory( QFile::encodeName(service->library()) );
|
||||
}
|
||||
|
||||
it = offers.begin();
|
||||
KTrader::OfferList::Iterator it = offers.begin();
|
||||
for ( ; !factory && it != offers.end() ; ++it )
|
||||
{
|
||||
service = (*it);
|
||||
|
@ -193,6 +172,51 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
|
|||
return KonqViewFactory( factory, args, service->serviceTypes().contains( "Browser/View" ) );
|
||||
}
|
||||
|
||||
void KonqFactory::getOffers( const QString & serviceType,
|
||||
KTrader::OfferList *partServiceOffers,
|
||||
KTrader::OfferList *appServiceOffers )
|
||||
{
|
||||
KTrader::OfferList offers = KTrader::self()->query( serviceType );
|
||||
|
||||
if ( appServiceOffers )
|
||||
{
|
||||
*appServiceOffers = offers;
|
||||
KTrader::OfferList::Iterator it = appServiceOffers->begin();
|
||||
while ( it != appServiceOffers->end() )
|
||||
{
|
||||
//kdDebug(1202) << (*it)->desktopEntryName() << endl;
|
||||
// Remove pure services (no app), and also remove ourselves... :-}
|
||||
if ( (*it)->type() != "Application"
|
||||
|| (*it)->desktopEntryName() == "kfmclient" )
|
||||
{
|
||||
it = appServiceOffers->remove( it );
|
||||
// it points to the next one now
|
||||
}
|
||||
else
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
KTrader::OfferList::Iterator it = offers.begin();
|
||||
// Remove irrelevant entries (non parts)
|
||||
while ( it != offers.end() )
|
||||
{
|
||||
QStringList serviceTypes = (*it)->serviceTypes();
|
||||
if ( !serviceTypes.contains( "KParts/ReadOnlyPart" ) && !serviceTypes.contains( "Browser/View" ) )
|
||||
{
|
||||
//kdDebug(1202) << "Service " << (*it)->name() << " not embeddable" << endl;
|
||||
it = offers.remove( it );
|
||||
// it points to the next one now
|
||||
continue;
|
||||
}
|
||||
++it;
|
||||
}
|
||||
|
||||
if ( partServiceOffers )
|
||||
(*partServiceOffers) = offers;
|
||||
}
|
||||
|
||||
|
||||
const KAboutData *KonqFactory::aboutData()
|
||||
{
|
||||
if (!s_aboutData)
|
||||
|
@ -223,3 +247,4 @@ const KAboutData *KonqFactory::aboutData()
|
|||
}
|
||||
return s_aboutData;
|
||||
}
|
||||
|
||||
|
|
|
@ -63,7 +63,11 @@ public:
|
|||
KService::Ptr *serviceImpl = 0,
|
||||
KTrader::OfferList *partServiceOffers = 0,
|
||||
KTrader::OfferList *appServiceOffers = 0);
|
||||
|
||||
|
||||
static void getOffers( const QString & serviceType,
|
||||
KTrader::OfferList *partServiceOffers = 0,
|
||||
KTrader::OfferList *appServiceOffers = 0);
|
||||
|
||||
static const KAboutData* aboutData();
|
||||
|
||||
private:
|
||||
|
|
|
@ -1389,23 +1389,12 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part )
|
|||
|
||||
// View-dependent GUI
|
||||
|
||||
unplugActionList( "openwith" );
|
||||
updateOpenWithActions( m_currentView->appServiceOffers() );
|
||||
if ( m_currentView->appServiceOffers().count() > 0 )
|
||||
plugActionList( "openwith", m_openWithActions );
|
||||
updateOpenWithActions();
|
||||
|
||||
if ( !m_bViewModeToggled ) // if we just toggled the view mode via the view mode actions, then
|
||||
// we don't need to do all the time-taking stuff below (Simon)
|
||||
{
|
||||
unplugViewModeActions();
|
||||
updateViewModeActions( m_currentView->partServiceOffers() );
|
||||
|
||||
KService::Ptr service = m_currentView->service();
|
||||
QVariant prop = service->property( "X-KDE-BrowserView-Toggable" );
|
||||
if ( !prop.isValid() || !prop.toBool() ) // No view mode for toggable views
|
||||
// (The other way would be to enforce a better servicetype for them, than Browser/View)
|
||||
if ( m_currentView->partServiceOffers().count() > 1 && m_viewModeMenu )
|
||||
plugViewModeActions();
|
||||
updateViewModeActions();
|
||||
|
||||
m_pMenuNew->setEnabled( m_currentView->serviceType() == QString::fromLatin1( "inode/directory" ) );
|
||||
}
|
||||
|
@ -1863,7 +1852,7 @@ void KonqMainWindow::slotGoMenuAboutToShow()
|
|||
}
|
||||
|
||||
void KonqMainWindow::slotGoHistoryActivated( int steps )
|
||||
{
|
||||
{
|
||||
if (!m_goBuffer)
|
||||
{
|
||||
// Only start 1 timer.
|
||||
|
@ -2004,13 +1993,13 @@ void KonqMainWindow::slotRotation( KCompletionBase::KeyBindingType type )
|
|||
|
||||
bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
|
||||
{
|
||||
if ( ( ev->type()==QEvent::FocusIn || ev->type()==QEvent::FocusOut ) &&
|
||||
if ( ( ev->type()==QEvent::FocusIn || ev->type()==QEvent::FocusOut ) &&
|
||||
m_combo && m_combo->lineEdit() == obj )
|
||||
{
|
||||
kdDebug() << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl;
|
||||
|
||||
QFocusEvent * focusEv = static_cast<QFocusEvent*>(ev);
|
||||
if (focusEv->reason() == QFocusEvent::Popup || !m_combo || obj != m_combo->lineEdit())
|
||||
if (focusEv->reason() == QFocusEvent::Popup)
|
||||
{
|
||||
return KParts::MainWindow::eventFilter( obj, ev );
|
||||
}
|
||||
|
@ -2933,10 +2922,13 @@ void KonqMainWindow::slotClearStatusText()
|
|||
statusBar->slotClear();
|
||||
}
|
||||
|
||||
void KonqMainWindow::updateOpenWithActions( const KTrader::OfferList &services )
|
||||
void KonqMainWindow::updateOpenWithActions()
|
||||
{
|
||||
unplugActionList( "openwith" );
|
||||
|
||||
m_openWithActions.clear();
|
||||
|
||||
const KTrader::OfferList & services = m_currentView->appServiceOffers();
|
||||
KTrader::OfferList::ConstIterator it = services.begin();
|
||||
KTrader::OfferList::ConstIterator end = services.end();
|
||||
for (; it != end; ++it )
|
||||
|
@ -2949,10 +2941,13 @@ void KonqMainWindow::updateOpenWithActions( const KTrader::OfferList &services )
|
|||
|
||||
m_openWithActions.append( action );
|
||||
}
|
||||
if ( services.count() > 0 )
|
||||
plugActionList( "openwith", m_openWithActions );
|
||||
}
|
||||
|
||||
void KonqMainWindow::updateViewModeActions( const KTrader::OfferList &services )
|
||||
void KonqMainWindow::updateViewModeActions()
|
||||
{
|
||||
unplugViewModeActions();
|
||||
if ( m_viewModeMenu )
|
||||
{
|
||||
QListIterator<KAction> it( m_viewModeActions );
|
||||
|
@ -2964,6 +2959,8 @@ void KonqMainWindow::updateViewModeActions( const KTrader::OfferList &services )
|
|||
m_viewModeMenu = 0;
|
||||
m_viewModeActions.clear();
|
||||
|
||||
const KTrader::OfferList &services = m_currentView->partServiceOffers();
|
||||
|
||||
if ( services.count() <= 1 )
|
||||
return;
|
||||
|
||||
|
@ -2981,9 +2978,9 @@ void KonqMainWindow::updateViewModeActions( const KTrader::OfferList &services )
|
|||
QString icon = (*it)->icon();
|
||||
if ( icon != QString::fromLatin1( "unknown" ) )
|
||||
// we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon)
|
||||
action = new KRadioAction( (*it)->comment(), icon, 0, this, (*it)->desktopEntryName().ascii() );
|
||||
action = new KRadioAction( (*it)->name(), icon, 0, this, (*it)->desktopEntryName().ascii() );
|
||||
else
|
||||
action = new KRadioAction( (*it)->comment(), 0, this, (*it)->desktopEntryName().ascii() );
|
||||
action = new KRadioAction( (*it)->name(), 0, this, (*it)->desktopEntryName().ascii() );
|
||||
|
||||
if ( (*it)->desktopEntryName() == m_currentView->service()->desktopEntryName() )
|
||||
action->setChecked( true );
|
||||
|
@ -2997,6 +2994,11 @@ void KonqMainWindow::updateViewModeActions( const KTrader::OfferList &services )
|
|||
action->plug( m_viewModeMenu->popupMenu() );
|
||||
}
|
||||
}
|
||||
|
||||
if ( !m_currentView->isToggleView() ) // No view mode for toggable views
|
||||
// (The other way would be to enforce a better servicetype for them, than Browser/View)
|
||||
if ( /* already tested: services.count() > 1 && */ m_viewModeMenu )
|
||||
plugViewModeActions();
|
||||
}
|
||||
|
||||
void KonqMainWindow::plugViewModeActions()
|
||||
|
|
|
@ -163,6 +163,8 @@ public:
|
|||
void disableActionsNoView();
|
||||
|
||||
void updateToolBarActions();
|
||||
void updateOpenWithActions();
|
||||
void updateViewModeActions();
|
||||
|
||||
bool fullScreenMode() const { return m_bFullScreen; }
|
||||
|
||||
|
@ -368,8 +370,6 @@ private:
|
|||
void connectExtension( KParts::BrowserExtension *ext );
|
||||
void disconnectExtension( KParts::BrowserExtension *ext );
|
||||
|
||||
void updateOpenWithActions( const KTrader::OfferList &services );
|
||||
void updateViewModeActions( const KTrader::OfferList &services );
|
||||
void plugViewModeActions();
|
||||
void unplugViewModeActions();
|
||||
|
||||
|
@ -490,7 +490,7 @@ private:
|
|||
|
||||
typedef QMap<QCString,QCString> ActionSlotMap;
|
||||
static ActionSlotMap *s_actionSlotMap;
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -147,7 +147,7 @@ void KonqProfileDlg::slotSave()
|
|||
QString name = KIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/'
|
||||
|
||||
// Reuse filename of existing item, if any
|
||||
if ( m_pListBox->currentItem() != -1 )
|
||||
if ( m_pListBox->currentItem() != -1 && m_pListBox->isSelected(m_pListBox->currentItem()) )
|
||||
{
|
||||
QMap<QString, QString>::Iterator it = m_mapEntries.find( m_pListBox->currentText() );
|
||||
if ( it != m_mapEntries.end() )
|
||||
|
@ -157,6 +157,7 @@ void KonqProfileDlg::slotSave()
|
|||
}
|
||||
}
|
||||
|
||||
kdDebug(1202) << "Saving as " << name << endl;
|
||||
m_pViewManager->saveViewProfile( name, m_pProfileNameLineEdit->text(),
|
||||
m_cbSaveURLs->isChecked(), m_cbSaveSize->isChecked() );
|
||||
|
||||
|
|
|
@ -231,6 +231,15 @@ bool KonqView::changeViewMode( const QString &serviceType,
|
|||
kdDebug(1202) << "Giving focus to new part " << m_pPart << endl;
|
||||
m_pMainWindow->viewManager()->setActivePart( m_pPart );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_serviceType = serviceType;
|
||||
kdDebug() << "KonqView::changeViewMode service type set to " << m_serviceType << endl;
|
||||
// Re-query the trader
|
||||
KonqFactory::getOffers( m_serviceType, &m_partServiceOffers, &m_appServiceOffers );
|
||||
if ( m_pMainWindow->currentView() == this )
|
||||
m_pMainWindow->updateViewModeActions();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,37 +1,42 @@
|
|||
[Desktop Entry]
|
||||
Type=Service
|
||||
Exec=blahfoo
|
||||
Comment=Detailed List View
|
||||
Comment[ca]=Vista de llista detallada
|
||||
Comment[cs]=Detailní pohled
|
||||
Comment[da]=Detaljeret listevisning
|
||||
Comment[de]=Detaillierte Verzeichnis-Ansicht
|
||||
Comment[eo]=Detala listrigardo
|
||||
Comment[es]=Vista en lista detallada
|
||||
Comment[et]=Vaade detailse nimekirjana
|
||||
Comment[fi]=Yksityiskohtainen listanäkymä
|
||||
Comment[fr]=Liste détaillée
|
||||
Comment[he]=תטרופמ המישר תגוצת
|
||||
Comment[hr]=Detaljni pogled
|
||||
Comment[hu]=Részletes listanézet
|
||||
Comment[is]=Ítlarleg sýn, listi
|
||||
Comment[it]=Vista a lista dettagliata
|
||||
Comment[ja]=詳細なリストビュー
|
||||
Comment[mk]=Детален листа-приказ
|
||||
Comment[nl]=Gedetailleerde lijstweergave
|
||||
Comment[no]=Detaljert listevisning
|
||||
Comment[no_NY]=Detaljert listevising
|
||||
Comment[pl]=Widok ze szczegółową listą
|
||||
Comment[pt]=Vista Detalhada em Lista
|
||||
Comment[ro]=Vizualizare listă detaliată
|
||||
Comment[ru]=Детальный вид
|
||||
Comment[sl]=Ogled podrobnega seznama
|
||||
Comment[sr]=Detaljni pogled (lista)
|
||||
Comment[ta]=விரிவான காடஂசி
|
||||
Comment[tr]=Ayrıntılı Liste Görünümü
|
||||
Comment[uk]=Детальний вигляд списком
|
||||
Name=Detailed List View
|
||||
Name[ca]=Vista de llista detallada
|
||||
Name[cs]=Detailní pohled
|
||||
Name[da]=Detaljeret listevisning
|
||||
Name[de]=Detaillierte Verzeichnis-Ansicht
|
||||
Name[el]=Προβολή Λεπτομερούς Λίστας
|
||||
Name[eo]=Detala listrigardo
|
||||
Name[es]=Vista en lista detallada
|
||||
Name[et]=Vaade detailse nimekirjana
|
||||
Name[fi]=Yksityiskohtainen listanäkymä
|
||||
Name[fr]=Liste détaillée
|
||||
Name[gl]=Vista de Lista Detallada
|
||||
Name[he]=םיטרפ תגוצת
|
||||
Name[hr]=Detaljni pogled
|
||||
Name[hu]=részletes listanézet
|
||||
Name[is]=Ítarleg sýn, listi
|
||||
Name[it]=Vista a lista dettagliata
|
||||
Name[ja]=詳細なリストビュー
|
||||
Name[mk]=Детален листа-приказ
|
||||
Name[nl]=Gedetailleerde lijstweergave
|
||||
Name[no]=Detaljert listevisning
|
||||
Name[no_NY]=Detaljert listevising
|
||||
Name[pl]=Widok ze szczegółową listą
|
||||
Name[pt]=Vista Detalhada em Lista
|
||||
Name[pt_BR]=Visão lista detalhada
|
||||
Name[ro]=Vizualizare listă detaliată
|
||||
Name[ru]=Детальный вид
|
||||
Name[sk]=Detailný Zoznam
|
||||
Name[sl]=Ogled podrobnega seznama
|
||||
Name[sr]=Detaljni pogled (lista)
|
||||
Name[sv]=Detaljerad listvy
|
||||
Name[ta]=Å¢Ã¢Å¡É ÀðÊÂø ¸¡ðº¢
|
||||
Name[tr]=Ayrıntılı Liste Görünümü
|
||||
Name[uk]=Детальний вигляд списком
|
||||
Name[zh_CN.GB2312]=详细的列表视图
|
||||
MimeType=inode/directory
|
||||
Name=KonqDetailedListView
|
||||
ServiceTypes=KParts/ReadOnlyPart,Browser/View
|
||||
X-KDE-Library=libkonqlistview
|
||||
X-KDE-BrowserView-Args=DetailedList
|
||||
|
|
|
@ -1,37 +1,42 @@
|
|||
[Desktop Entry]
|
||||
Type=Service
|
||||
Exec=blahfoo
|
||||
Comment=Text View
|
||||
Comment[ca]=Vista de text
|
||||
Comment[cs]=Textový pohled
|
||||
Comment[da]=Tekstvisning
|
||||
Comment[de]=Text-Ansicht
|
||||
Comment[eo]=Tekstrigardo
|
||||
Comment[es]=Vista de texto
|
||||
Comment[et]=Vaade tekstina
|
||||
Comment[fi]=Tekstinäkymä
|
||||
Comment[fr]=Texte
|
||||
Comment[he]=טסקט תגוצת
|
||||
Comment[hr]=Tekstualni pogled
|
||||
Comment[hu]=Szöveges nézet
|
||||
Comment[is]=Textasýn
|
||||
Comment[it]=Vista testuale
|
||||
Comment[ja]=テキストビュー
|
||||
Comment[mk]=Текст-приказ
|
||||
Comment[nl]=Tekstweergave
|
||||
Comment[no]=Tekstvisning
|
||||
Comment[no_NY]=Tekstvising
|
||||
Comment[pl]=Widok tekstowy
|
||||
Comment[pt]=Vista em Texto
|
||||
Comment[ro]=Vizualizare text
|
||||
Comment[ru]=Текстовый вид
|
||||
Comment[sl]=Besedilni pogled
|
||||
Comment[sr]=Tekstualni pogled
|
||||
Comment[ta]=உைர காடஂசி
|
||||
Comment[tr]=Metin Görünümü
|
||||
Comment[uk]=Текстовий вигляд
|
||||
Name=Text View
|
||||
Name[ca]=Vista de text
|
||||
Name[cs]=Textový pohled
|
||||
Name[da]=Tekstvisning
|
||||
Name[de]=Text-Ansicht
|
||||
Name[el]=Προβολή Κειμένου
|
||||
Name[eo]=Tekstrigardo
|
||||
Name[es]=Vista de texto
|
||||
Name[et]=Vaade tekstina
|
||||
Name[fi]=Tekstinäkymä
|
||||
Name[fr]=Texte
|
||||
Name[gl]=Vista en modo texto
|
||||
Name[he]=טסקט תגוצת
|
||||
Name[hr]=Tekstualni pogled
|
||||
Name[hu]=szöveges nézet
|
||||
Name[is]=Textasýn
|
||||
Name[it]=Vista testuale
|
||||
Name[ja]=テキストビュー
|
||||
Name[mk]=Текст-приказ
|
||||
Name[nl]=Tekstweergave
|
||||
Name[no]=Tekstvisning
|
||||
Name[no_NY]=Tekstvising
|
||||
Name[pl]=Widok tekstowy
|
||||
Name[pt]=Vista em Texto
|
||||
Name[pt_BR]=Visão texto
|
||||
Name[ro]=Vizualizare text
|
||||
Name[ru]=Текстовый вид
|
||||
Name[sk]=Prezerač Textu
|
||||
Name[sl]=Besedilni pogled
|
||||
Name[sr]=Tekstualni pogled
|
||||
Name[sv]=Textvy
|
||||
Name[ta]=¯¨Ã ¸¡ðº¢
|
||||
Name[tr]=Metin Görünümü
|
||||
Name[uk]=Текстовий вигляд
|
||||
Name[zh_CN.GB2312]=文字视图
|
||||
MimeType=inode/directory
|
||||
Name=KonqTextView
|
||||
ServiceTypes=Browser/View
|
||||
X-KDE-Library=libkonqlistview
|
||||
X-KDE-BrowserView-Args=TextView
|
||||
|
|
|
@ -1,37 +1,42 @@
|
|||
[Desktop Entry]
|
||||
Type=Service
|
||||
Exec=blahfoo
|
||||
Comment=Tree View
|
||||
Comment[ca]=Vista d'arbre
|
||||
Comment[cs]=Stromový pohled
|
||||
Comment[da]=Trævisning
|
||||
Comment[de]=Baum-Ansicht
|
||||
Comment[eo]=Arba rigardo
|
||||
Comment[es]=Vista en árbol
|
||||
Comment[et]=Vaade puuna
|
||||
Comment[fi]=Puunäkymä
|
||||
Comment[fr]=Arborescence
|
||||
Comment[he]=ץע תגוצת
|
||||
Comment[hr]=Pregled stabla
|
||||
Comment[hu]=Fa-nézet
|
||||
Comment[is]=Trjáasýn
|
||||
Comment[it]=Vista ad albero
|
||||
Comment[ja]=ツリービュー
|
||||
Comment[mk]=Дрво-приказ
|
||||
Comment[nl]=Boomstructuurweergave
|
||||
Comment[no]=Trevisning
|
||||
Comment[no_NY]=Trevising
|
||||
Comment[pl]=Widok drzewa
|
||||
Comment[pt]=Vista em Árvore
|
||||
Comment[ro]=Vizualizare arborescentă
|
||||
Comment[ru]=Дерево
|
||||
Comment[sl]=Drevesni pogled
|
||||
Comment[sr]=Stablo direktorijuma
|
||||
Comment[ta]=மரமஂ காடஂசி
|
||||
Comment[tr]=Ağaç Görünümü
|
||||
Comment[uk]=Вигляд структури каталогів
|
||||
Name=Tree View
|
||||
Name[ca]=Vista d'arbre
|
||||
Name[cs]=Stromový pohled
|
||||
Name[da]=Trævisning
|
||||
Name[de]=Baum-Ansicht
|
||||
Name[el]=Προβολή Δέντρου
|
||||
Name[eo]=Arba rigardo
|
||||
Name[es]=Vista en árbol
|
||||
Name[et]=Vaade puuna
|
||||
Name[fi]=Puunäkymä
|
||||
Name[fr]=Arborescence
|
||||
Name[gl]=Vista en modo árbore
|
||||
Name[he]=ץע תגוצת
|
||||
Name[hr]=Pregled stabla
|
||||
Name[hu]=fa-nézet
|
||||
Name[is]=Trjáasýn
|
||||
Name[it]=Vista ad albero
|
||||
Name[ja]=ツリービュー
|
||||
Name[mk]=Дрво-приказ
|
||||
Name[nl]=Boomstructuurweergave
|
||||
Name[no]=Trevisning
|
||||
Name[no_NY]=Trevising
|
||||
Name[pl]=Widok drzewa
|
||||
Name[pt]=Vista em Árvore
|
||||
Name[pt_BR]=Visão em Árvore
|
||||
Name[ro]=Vizualizare arborescentă
|
||||
Name[ru]=Дерево
|
||||
Name[sk]=Prezerač stromovej štruktúry
|
||||
Name[sl]=Drevesni pogled
|
||||
Name[sr]=Stablo direktorijuma
|
||||
Name[sv]=Trädvy
|
||||
Name[ta]=ÁÃõ ¸¡ðº¢
|
||||
Name[tr]=Ağaç Görünümü
|
||||
Name[uk]=Вигляд структури каталогів
|
||||
Name[zh_CN.GB2312]=树形视图
|
||||
MimeType=inode/directory
|
||||
Name=KonqTreeView
|
||||
ServiceTypes=KParts/ReadOnlyPart,Browser/View
|
||||
X-KDE-Library=libkonqlistview
|
||||
X-KDE-BrowserView-Args=MixedTree
|
||||
|
|
Loading…
Reference in a new issue