Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Texture Chooser shouldn't have been left in the main menu...

Browse source
This commit is contained in:
dfighter1985 2014-09-17 19:21:39 +02:00
parent 8ca98c91e9
commit 49e8343345
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/studio/src/plugins/gui_editor/gui_editor_window.cpp
View file

@ -44,7 +44,6 @@
#include "editor_selection_watcher.h" #include "editor_selection_watcher.h"
#include "editor_message_processor.h" #include "editor_message_processor.h"
#include "add_widget_widget.h" #include "add_widget_widget.h"
#include "texture_chooser.h"
namespace GUIEditor namespace GUIEditor
{ {
@ -71,8 +70,6 @@ namespace GUIEditor
widgetInfoTree = new CWidgetInfoTree; widgetInfoTree = new CWidgetInfoTree;
tc = new TextureChooser();
createMenus(); createMenus();
readSettings(); readSettings();
@ -118,9 +115,6 @@ namespace GUIEditor
removeMenus(); removeMenus();
delete tc;
tc = NULL;
delete messageProcessor; delete messageProcessor;
messageProcessor = NULL; messageProcessor = NULL;
@ -359,12 +353,6 @@ namespace GUIEditor
GUICtrl->show(); GUICtrl->show();
} }
void GUIEditorWindow::onTCClicked()
{
tc->load();
tc->exec();
}
void GUIEditorWindow::createMenus() void GUIEditorWindow::createMenus()
{ {
Core::MenuManager *mm = Core::ICore::instance()->menuManager(); Core::MenuManager *mm = Core::ICore::instance()->menuManager();
@ -411,10 +399,6 @@ namespace GUIEditor
connect( a, SIGNAL( triggered( bool ) ), this, SLOT( onAddWidgetClicked() ) ); connect( a, SIGNAL( triggered( bool ) ), this, SLOT( onAddWidgetClicked() ) );
m->addAction( a ); m->addAction( a );
a = new QAction( "Texture Chooser", this );
connect( a, SIGNAL( triggered( bool ) ), this, SLOT( onTCClicked() ) );
m->addAction( a );
menu = m; menu = m;
} }
} }

6
code/studio/src/plugins/gui_editor/gui_editor_window.h
View file

@ -25,11 +25,8 @@
#include "property_browser_ctrl.h" #include "property_browser_ctrl.h"
class QtTreePropertyBrowser; class QtTreePropertyBrowser;
class QMenu; class QMenu;
class TextureChooser;
namespace GUIEditor namespace GUIEditor
{ {
@ -67,7 +64,6 @@ private Q_SLOTS:
void onGUILoaded(); void onGUILoaded();
void onAddWidgetClicked(); void onAddWidgetClicked();
void onTreeChanged(); void onTreeChanged();
void onTCClicked();
protected: protected:
void hideEvent( QHideEvent *evnt ); void hideEvent( QHideEvent *evnt );
@ -100,8 +96,6 @@ private:
QString currentProjectFile; QString currentProjectFile;
QMenu *menu; QMenu *menu;
TextureChooser *tc;
}; };
} }