Further improvments to plugin template:

- use standard convention of ui being named FooGuiBase git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7873 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 8, 2008 · 6d53141 · 6d53141
1 parent 1dfd005
commit 6d53141
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/plugins/plugin_builder.py b/src/plugins/plugin_builder.py
@@ -118,7 +118,7 @@ def plugin_file(pluginDir, file):
 shutil.copy(template_file('plugin.h'),        os.path.join(pluginDir, pluginLCaseName + '.h'))
 shutil.copy(template_file('plugingui.cpp'),   os.path.join(pluginDir, pluginLCaseName + 'gui.cpp'))
 shutil.copy(template_file('plugingui.h'),     os.path.join(pluginDir, pluginLCaseName + 'gui.h'))
-shutil.copy(template_file('plugingui.ui'),    os.path.join(pluginDir, pluginLCaseName + 'gui.ui'))
+shutil.copy(template_file('pluginguibase.ui'),    os.path.join(pluginDir, pluginLCaseName + 'guibase.ui'))
 
 # Substitute the plugin specific vars in the various files
 # This is a brute force approach but its quick and dirty :)
@@ -131,7 +131,7 @@ def plugin_file(pluginDir, file):
 	  plugin_file(pluginDir, pluginLCaseName + '.h'),
 	  plugin_file(pluginDir, pluginLCaseName + 'gui.cpp'),
 	  plugin_file(pluginDir, pluginLCaseName + 'gui.h'),
-	  plugin_file(pluginDir, pluginLCaseName + 'gui.ui') ]
+	  plugin_file(pluginDir, pluginLCaseName + 'guibase.ui') ]
 
 # replace occurences of [pluginlcasename], [pluginname], [plugindescription], [menuname], [menutiem]
 # in template with the values from user

diff --git a/src/plugins/plugin_template/CMakeLists.txt b/src/plugins/plugin_template/CMakeLists.txt
@@ -7,7 +7,7 @@ SET ([pluginlcasename]_SRCS
      [pluginlcasename]gui.cpp
 )
 
-SET ([pluginlcasename]_UIS [pluginlcasename]gui.ui)
+SET ([pluginlcasename]_UIS [pluginlcasename]guibase.ui)
 
 SET ([pluginlcasename]_MOC_HDRS
      [pluginlcasename].h

diff --git a/src/plugins/plugin_template/plugingui.h b/src/plugins/plugin_template/plugingui.h
@@ -13,12 +13,12 @@
 #define [pluginname]GUI_H
 
 #include <QDialog>
-#include <ui_[pluginlcasename]gui.h>
+#include <ui_[pluginlcasename]guibase.h>
 
 /**
 @author Tim Sutton
 */
-class [pluginname]Gui : public QDialog, private Ui::[pluginname]Gui
+class [pluginname]Gui : public QDialog, private Ui::[pluginname]GuiBase
 {
 Q_OBJECT
 public:

diff --git a/src/plugins/plugin_template/plugingui.ui → src/plugins/plugin_template/pluginguibase.ui b/src/plugins/plugin_template/plugingui.ui → src/plugins/plugin_template/pluginguibase.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>[pluginname]Gui</class>
- <widget class="QDialog" name="[pluginname]Gui" >
+ <class>[pluginname]GuiBase</class>
+ <widget class="QDialog" name="[pluginname]GuiBase" >
   <property name="geometry" >
    <rect>
     <x>0</x>