summaryrefslogtreecommitdiffstats
path: root/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'plugin')
-rw-r--r--plugin/Makefile.am13
-rw-r--r--plugin/smb4k_add.desktop70
-rw-r--r--plugin/smb4k_konqplugin.cpp22
-rw-r--r--plugin/smb4k_konqplugin.h2
4 files changed, 17 insertions, 90 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
deleted file mode 100644
index b7b2dc6..0000000
--- a/plugin/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-INCLUDES = $(all_includes)
-METASOURCES = AUTO
-kde_module_LTLIBRARIES = konqsidebar_smb4k.la
-konqsidebar_smb4k_la_SOURCES = smb4k_konqplugin.cpp
-konqsidebar_smb4k_la_LDFLAGS = -module $(all_libraries) \
- -L$(top_builddir)/smb4k/core -L$(topbuild_dir)/smb4k/widgets -lkonqsidebarplugin
-konqsidebar_smb4k_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDECORE) \
- $(LIB_TDEUI)
-
-globaladddir = $(kde_datadir)/konqsidebartng/add
-globaladd_DATA = smb4k_add.desktop
-noinst_HEADERS = smb4k_konqplugin.h
diff --git a/plugin/smb4k_add.desktop b/plugin/smb4k_add.desktop
index aa29a61..a32af05 100644
--- a/plugin/smb4k_add.desktop
+++ b/plugin/smb4k_add.desktop
@@ -1,73 +1,13 @@
[Desktop Entry]
-Name=Samba Browser
-Icon=smb4k
Type=Application
+
+Name=Samba Browser
+
GenericName=The SMB/CIFS Share Browser
-GenericName[bg]=Самба ресурсен четец
-GenericName[ca]=El navegador de compartits SMB/CIFS
-GenericName[cs]=Prohližeč SMB/CIFS sdílení
-GenericName[de]=Der Browser für SMB/CIFS-Freigaben
-GenericName[es]=El explorador de recursos compartidos SMB/CIFS
-GenericName[fr]=L'explorateur de partages SMB / CIFS
-GenericName[hu]=Az SMB/CIFS böngésző
-GenericName[it]=Browser di condivisioni SMB/CIFS
-GenericName[ja]=SMB/CIFS 共有(シェア)・ブラウザー
-GenericName[nl]=De SMB/CIFS Share Browser
-GenericName[no]=SMB/CIFS ressurs utforsker
-GenericName[no_NY]=SMB/CIFS ressurs surfar
-GenericName[pl]=Przeglądarka Zasobów SMB/CIFS
-GenericName[pt_BR]=O navegador de compartilhamentos SMB/CIFS
-GenericName[ru]=The SMB/CIFS Share Browser
-GenericName[sk]=Prehliadač SMB/CIFS zdieľaní
-GenericName[sv]=SMB Katalog programmed
-GenericName[tr]=SMB/CIFS Paylaşım Tarayıcısı
-GenericName[uk]=Навігатор спільних ресурсів SMB/CIFS
-GenericName[zh_CN]=SMB 共享浏览器"
-#
-# The following lines seem to be necessary for SuSE.
-#
-Name[bg]=Samba Browser
-Name[ca]=Samba Browser
-Name[cs]=Samba Browser
-Name[de]=Samba Browser
-Name[es]=Samba Browser
-Name[fr]=Samba Browser
-Name[hu]=Samba Browser
-Name[it]=Samba Browser
-Name[ja]=Samba Browser
-Name[nl]=Samba Browser
-Name[no]=Samba Browser
-Name[no_NY]=Samba Browser
-Name[pl]=Samba Browser
-Name[pt_BR]=Samba Browser
-Name[ru]=Samba Browser
-Name[sk]=Samba Browser
-Name[sv]=Samba Browser
-Name[tr]=Samba Tarayıcısı
-Name[uk]=Samba Browser
-Name[zh_CN]=Samba Browser
+
Comment=The SMB/CIFS Share Browser
-Comment[bg]=Самба ресурсен четец
-Comment[ca]=El navegador de compartits SMB/CIFS
-Comment[cs]=Prohližeč SMB/CIFS sdílení
-Comment[de]=Der Browser für SMB/CIFS-Freigaben
-Comment[es]=El explorador de recursos compartidos SMB/CIFS
-Comment[fr]=L'explorateur de partages SMB / CIFS
-Comment[hu]=Az SMB/CIFS böngésző
-Comment[it]=Browser di condivisioni SMB/CIFS
-Comment[ja]=SMB/CIFS 共有(シェア)・ブラウザー
-Comment[nl]=De SMB/CIFS Share Browser
-Comment[no]=SMB/CIFS ressurs utforsker
-Comment[no_NY]=SMB/CIFS ressurs surfar
-Comment[pl]=Przeglądarka Zasobów SMB/CIFS
-Comment[pt_BR]=O navegador de compartilhamentos SMB/CIFS
-Comment[ru]=The SMB/CIFS Share Browser
-Comment[sk]=Prehliadač SMB/CIFS zdieľaní
-Comment[sv]=SMB Katalog programmed
-Comment[tr]=SMB/CIFS Paylaşım Tarayıcısı
-Comment[uk]=Навігатор спільних ресурсів SMB/CIFS
-Comment[zh_CN]=SMB 共享浏览器"
+Icon=smb4k
X-Open=false
X-TDE-KonqSidebarAddModule=konqsidebar_smb4k
X-TDE-KonqSidebarUniversal=true
diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp
index fa71d4b..5cf88fc 100644
--- a/plugin/smb4k_konqplugin.cpp
+++ b/plugin/smb4k_konqplugin.cpp
@@ -36,7 +36,7 @@
// KDE includes
#include <klibloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <kiconloader.h>
#include <tdemessagebox.h>
@@ -67,9 +67,9 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget
TDEToolBar *topBar = new TDEToolBar( widget, "Topbar" );
topBar->setIconSize(16);
- topBar->insertButton( "reload", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRescan() ) , TRUE, i18n( "Scan Network" ) );
- topBar->insertButton( "edit-find", 1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSearch() ) , TRUE, i18n( "Search" ) );
- topBar->insertButton( "configure", 2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSmb4KOptionsDlg() ) , TRUE, i18n( "Configure" ) );
+ topBar->insertButton( "reload", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRescan() ) , true, i18n( "Scan Network" ) );
+ topBar->insertButton( "edit-find", 1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSearch() ) , true, i18n( "Search" ) );
+ topBar->insertButton( "configure", 2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSmb4KOptionsDlg() ) , true, i18n( "Configure" ) );
//
// Browser widget:
@@ -78,7 +78,7 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget
if ( browser_factory )
{
- m_browser_part = static_cast<KParts::Part *>( browser_factory->create( TQT_TQOBJECT(widget), "BrowserPart", "KParts::Part", TQStringList( "konqplugin=\"true\"" ) ) );
+ m_browser_part = static_cast<KParts::Part *>( browser_factory->create( widget, "BrowserPart", "KParts::Part", TQStringList( "konqplugin=\"true\"" ) ) );
// Do nothing here. The network scan (and the mounting of recently used
// shares) will be done by Smb4KCore::init() below.
@@ -90,8 +90,8 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget
return;
}
- connect( Smb4KCore::mounter(), TQT_SIGNAL( mountedShare( const TQString &) ), this, TQT_SLOT( slotMountedShare( const TQString & ) ) );
- connect( Smb4KCore::mounter(), TQT_SIGNAL( aboutToUnmount( const TQString& ) ), this, TQT_SLOT( slotPrepareUnmount( const TQString& ) ) );
+ connect( Smb4KCore::mounter(), TQ_SIGNAL( mountedShare( const TQString &) ), this, TQ_SLOT( slotMountedShare( const TQString & ) ) );
+ connect( Smb4KCore::mounter(), TQ_SIGNAL( aboutToUnmount( const TQString& ) ), this, TQ_SLOT( slotPrepareUnmount( const TQString& ) ) );
// Scan the network and remount recently used shares:
Smb4KCore::self()->init();
@@ -151,7 +151,7 @@ void KonqSidebar_Smb4K::slotSearch()
TQFrame *frame = searchDialog->plainPage();
- m_search_part = static_cast<KParts::Part *>( search_factory->create( TQT_TQOBJECT(frame), "SearchDialogPart", "KParts::Part" ) );
+ m_search_part = static_cast<KParts::Part *>( search_factory->create( frame, "SearchDialogPart", "KParts::Part" ) );
if ( m_search_part )
{
@@ -164,7 +164,7 @@ void KonqSidebar_Smb4K::slotSearch()
// Instead we want that a search is started:
searchDialog->actionButton( KDialogBase::Close )->setAutoDefault( false );
- //connect( m_search_dialog, TQT_SIGNAL( searchResult( Smb4KHostItem * ) ), this, TQT_SLOT( slotInsertItem( Smb4KHostItem * ) ) );
+ //connect( m_search_dialog, TQ_SIGNAL( searchResult( Smb4KHostItem * ) ), this, TQ_SLOT( slotInsertItem( Smb4KHostItem * ) ) );
searchDialog->show();
}
@@ -188,11 +188,11 @@ void KonqSidebar_Smb4K::slotSmb4KOptionsDlg()
if ( config_factory )
{
- TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(widget), "ConfigDialog", "TDEConfigDialog" )) );
+ TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( config_factory->create( widget, "ConfigDialog", "TDEConfigDialog" ) );
if ( dlg )
{
- connect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) );
+ connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) );
dlg->show();
}
diff --git a/plugin/smb4k_konqplugin.h b/plugin/smb4k_konqplugin.h
index aa1c7f2..3e913aa 100644
--- a/plugin/smb4k_konqplugin.h
+++ b/plugin/smb4k_konqplugin.h
@@ -59,7 +59,7 @@ public:
/**
* Construct a @ref KonqSidebarPlugin.
*
- * @param inst The sidebar's kinstance class.
+ * @param inst The sidebar's tdeinstance class.
* @param parent The sidebar internal button info class responsible for this plugin.
* @param widgetParent The container which will contain the plugins widget.
* @param desktopName The filename of the configuration file.