Nabble - konqueror

[filetypes.diff]
Index: kdebase/runtime/keditfiletype/filegroupdetails.cpp

===================================================================

--- kdebase/runtime/keditfiletype/filegroupdetails.cpp	(Revision 1051048)

+++ kdebase/runtime/keditfiletype/filegroupdetails.cpp	(Arbeitskopie)

@@ -32,7 +32,7 @@

 {

   QVBoxLayout *secondLayout = new QVBoxLayout(this);

 

-  QGroupBox *autoEmbedBox = new QGroupBox( i18n("Left Click Action") );

+  QGroupBox *autoEmbedBox = new QGroupBox( i18n("Left Click Action (only for Konqueror file manager)") );

   m_autoEmbed = new QButtonGroup( autoEmbedBox );

   secondLayout->addWidget( autoEmbedBox );

   // The order of those two items is very important. If you change it, fix typeslistitem.cpp !

@@ -48,7 +48,8 @@

   autoEmbedBox->setWhatsThis( i18n("Here you can configure what the Konqueror file manager"

     " will do when you click on a file belonging to this group. Konqueror can display the file in"

     " an embedded viewer or start up a separate application. You can change this setting for a"

-    " specific file type in the 'Embedding' tab of the file type configuration.") );

+    " specific file type in the 'Embedding' tab of the file type configuration. Dolphin "

+    " shows files always in a separate viewer") );

 

   secondLayout->addStretch();

 }

Index: kdebase/runtime/keditfiletype/filetypedetails.cpp

===================================================================

--- kdebase/runtime/keditfiletype/filetypedetails.cpp	(Revision 1051048)

+++ kdebase/runtime/keditfiletype/filetypedetails.cpp	(Arbeitskopie)

@@ -144,7 +144,7 @@

   QWidget * secondWidget = new QWidget(m_tabWidget);

   QVBoxLayout *secondLayout = new QVBoxLayout(secondWidget);

 

-  m_autoEmbedBox = new QGroupBox( i18n("Left Click Action"), secondWidget );

+  m_autoEmbedBox = new QGroupBox( i18n("Left Click Action (only for Konqueror file manager)"), secondWidget );

   secondLayout->addWidget( m_autoEmbedBox );

 

   m_autoEmbedBox->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed );

@@ -153,7 +153,7 @@

   QRadioButton *sepViewerRadio = new QRadioButton( i18n("Show file in separate viewer") );

   m_rbGroupSettings = new QRadioButton( QString("Use settings for '%1' group") );

 

-  m_chkAskSave = new QCheckBox( i18n("Ask whether to save to disk instead") );

+  m_chkAskSave = new QCheckBox( i18n("Ask whether to save to disk instead (only for Konqueror browser)") );

   connect(m_chkAskSave, SIGNAL( toggled(bool) ), SLOT( slotAskSaveToggled(bool) ));

 

   m_autoEmbedGroup = new QButtonGroup(m_autoEmbedBox);

@@ -169,10 +169,11 @@

   vbox->addWidget(m_chkAskSave);

 

   m_autoEmbedBox->setWhatsThis( i18n("Here you can configure what the Konqueror file manager"

-    " will do when you click on a file of this type. Konqueror can display the file in"

+    " will do when you click on a file of this type. The Konqueror file manager can display the file in"

     " an embedded viewer or start up a separate application. If set to 'Use settings for G group',"

-    " Konqueror will behave according to the settings of the group G this type belongs to,"

-    " for instance 'image' if the current file type is image/png.") );

+    " the file manager will behave according to the settings of the group G this type belongs to,"

+    " for instance 'image' if the current file type is image/png. Dolphin "

+    " shows files always in a separate viewer") );

 

   embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );

 //  embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );


[konqmainwindow.patch]
Index: konqmainwindow.cpp

=========================

--- konqmainwindow.cpp	(revision 1044576)

+++ konqmainwindow.cpp	(working copy)

@@ -469,7 +469,7 @@

     if (m_currentDir.isEmpty() && m_currentView)

        m_currentDir = m_currentView->url().path( KUrl::AddTrailingSlash );

 

-    KUrl filteredURL ( KonqMisc::konqFilteredURL( this, url, m_currentDir ) );

+    const QString filteredURL = KonqMisc::konqFilteredURL( this, url, m_currentDir );

     kDebug(1202) << "url" << url << "filtered into" << filteredURL;

 

     if ( filteredURL.isEmpty() ) // initially empty, or error (e.g. ~unknown_user)

@@ -477,8 +477,16 @@

 

     m_currentDir.clear();

 

-    openUrl(0, filteredURL, QString(), req);

+    const QString prevFilteredURL = KonqMisc::konqFilteredURL(this, m_currentView->typedUrl(), m_currentDir);

+    kDebug(1202) << "previous url" << m_currentView->typedUrl() << "filtered into" << prevFilteredURL;

 

+    // If the current url in the view is the same as the one being displayed

+    // simply do a reload instead of calling openUrl...

+    if (urlcmp(filteredURL, prevFilteredURL))

+      slotReload();

+    else

+      openUrl(0, KUrl(filteredURL), QString(), req);

+

     // #4070: Give focus to view after URL was entered manually

     // Note: we do it here if the view mode (i.e. part) wasn't changed

     // If it is changed, then it's done in KonqView::changePart


[konqmainwindow.patch]
Index: konqmainwindow.cpp

=========================

--- konqmainwindow.cpp	(revision 1044576)

+++ konqmainwindow.cpp	(working copy)

@@ -469,7 +469,7 @@

     if (m_currentDir.isEmpty() && m_currentView)

        m_currentDir = m_currentView->url().path( KUrl::AddTrailingSlash );

 

-    KUrl filteredURL ( KonqMisc::konqFilteredURL( this, url, m_currentDir ) );

+    const QString filteredURL = KonqMisc::konqFilteredURL( this, url, m_currentDir );

     kDebug(1202) << "url" << url << "filtered into" << filteredURL;

 

     if ( filteredURL.isEmpty() ) // initially empty, or error (e.g. ~unknown_user)

@@ -477,8 +477,16 @@

 

     m_currentDir.clear();

 

-    openUrl(0, filteredURL, QString(), req);

+    const QString prevFilteredURL = KonqMisc::konqFilteredURL(this, m_currentView->typedUrl(), m_currentDir);

+    kDebug(1202) << "previous url" << m_currentView->typedUrl() << "filtered into" << prevFilteredURL;

 

+    // If the current url in the view is the same as the one being displayed

+    // simply do a reload instead of calling openUrl...

+    if (urlcmp(filteredURL, prevFilteredURL, KUrl::CompareWithoutTrailingSlash))

+      slotReload();

+    else

+      openUrl(0, KUrl(filteredURL), QString(), req);

+

     // #4070: Give focus to view after URL was entered manually

     // Note: we do it here if the view mode (i.e. part) wasn't changed

     // If it is changed, then it's done in KonqView::changePart



Nabble - konqueror

Re: Patch for bug #200795

Re: Actions extensions in File Manager

Re: Actions extensions in File Manager

Re: Patch for bug #200795

Actions extensions in File Manager

Tab moving in Konqueror

Re: File Associations Settings Module outdated?

Re: File Associations Settings Module outdated?

Re: Presentation of a new Khtml project (and Problems with mapToGlobal in LineEditWidget)

Re: Presentation of a new Khtml project (and Problems with mapToGlobal in LineEditWidget)

Re: File Associations Settings Module outdated?

Re: File Associations Settings Module outdated?

Presentation of a new Khtml project (and Problems with mapToGlobal in LineEditWidget)

Re: Patch for bug #200795

File Associations Settings Module outdated?

Re: PATCH: Entering the same url in Konqueror's location bar...

PATCH: Entering the same url in Konqueror's location bar...

Bekijk mijn Netlog profiel

Re: Problem with saving the "ServiceName" in Konqueror profile files...

Adblock Plugin improvements, part III

Re: Problem with saving the "ServiceName" in Konqueror profile files...

Problem with saving the "ServiceName" in Konqueror profile files...

Re: Flash plugin resize problem

Re: Flash plugin resize problem

Flash plugin resize problem

Re: how to activate Links / javascript function ?

how to activate Links / javascript function ?

Re: Introducing Project Silk

Re: Introducing Project Silk

Re: Introducing Project Silk

Re: Introducing Project Silk

Re: Introducing Project Silk

Re: Introducing Project Silk

Memory Leak when doing Reload()

Re: qte version