Commit 6d79653e authored by Pierre Kraemer's avatar Pierre Kraemer

SCHNApps: draw background first + update plugin dock icons

parent 5c229ffd
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>200</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>200</width> <width>218</width>
<height>673</height> <height>673</height>
</rect> </rect>
</property> </property>
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>200</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>200</width> <width>222</width>
<height>621</height> <height>621</height>
</rect> </rect>
</property> </property>
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>200</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
...@@ -63,6 +63,38 @@ e</string> ...@@ -63,6 +63,38 @@ e</string>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QPushButton" name="button_enablePlugins"> <widget class="QPushButton" name="button_enablePlugins">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>32</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QPushButton {
background-color: #bbb;
border: 2px solid black;
border-radius: 5px;
background-image: url(':icons/icons/arrow_down.png');
background-repeat: no-repeat;
background-position: center;
margin-right: 5px;
}
QPushButton:pressed {
background-color: #eee;
}</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -76,6 +108,38 @@ e</string> ...@@ -76,6 +108,38 @@ e</string>
</item> </item>
<item row="2" column="2"> <item row="2" column="2">
<widget class="QPushButton" name="button_disablePlugins"> <widget class="QPushButton" name="button_disablePlugins">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>32</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QPushButton {
background-color: #bbb;
border: 2px solid black;
border-radius: 5px;
background-image: url(':icons/icons/arrow_up.png');
background-repeat: no-repeat;
background-position: center;
margin-left: 5px;
}
QPushButton:pressed {
background-color: #eee;
}</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
......
SCHNApps/resources/icons/arrow_down.png

598 Bytes | W: | H:

SCHNApps/resources/icons/arrow_down.png

2.87 KB | W: | H:

SCHNApps/resources/icons/arrow_down.png
SCHNApps/resources/icons/arrow_down.png
SCHNApps/resources/icons/arrow_down.png
SCHNApps/resources/icons/arrow_down.png
  • 2-up
  • Swipe
  • Onion skin
SCHNApps/resources/icons/arrow_up.png

575 Bytes | W: | H:

SCHNApps/resources/icons/arrow_up.png

2.84 KB | W: | H:

SCHNApps/resources/icons/arrow_up.png
SCHNApps/resources/icons/arrow_up.png
SCHNApps/resources/icons/arrow_up.png
SCHNApps/resources/icons/arrow_up.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -20,9 +20,6 @@ ControlDock_PluginTab::ControlDock_PluginTab(SCHNApps* s) : ...@@ -20,9 +20,6 @@ ControlDock_PluginTab::ControlDock_PluginTab(SCHNApps* s) :
{ {
setupUi(this); setupUi(this);
button_enablePlugins->setIcon(QIcon(":icons/icons/arrow_down.png"));
button_disablePlugins->setIcon(QIcon(":icons/icons/arrow_up.png"));
connect(button_addPluginDirectory, SIGNAL(clicked()), this, SLOT(addPluginDirectoryClicked())); connect(button_addPluginDirectory, SIGNAL(clicked()), this, SLOT(addPluginDirectoryClicked()));
connect(button_enablePlugins, SIGNAL(clicked()), this, SLOT(enableSelectedPluginsClicked())); connect(button_enablePlugins, SIGNAL(clicked()), this, SLOT(enableSelectedPluginsClicked()));
connect(button_disablePlugins, SIGNAL(clicked()), this, SLOT(disableSelectedPluginsClicked())); connect(button_disablePlugins, SIGNAL(clicked()), this, SLOT(disableSelectedPluginsClicked()));
......
...@@ -75,7 +75,7 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt ...@@ -75,7 +75,7 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt
m_controlPluginTab = new ControlDock_PluginTab(this); m_controlPluginTab = new ControlDock_PluginTab(this);
m_controlDockTabWidget->addTab(m_controlPluginTab, m_controlPluginTab->title()); m_controlDockTabWidget->addTab(m_controlPluginTab, m_controlPluginTab->title());
m_controlDockTabWidget->setMaximumWidth(m_controlCameraTab->width()); // m_controlDockTabWidget->setMaximumWidth(m_controlCameraTab->width());
connect(action_ShowHideControlDock, SIGNAL(triggered()), this, SLOT(showHideControlDock())); connect(action_ShowHideControlDock, SIGNAL(triggered()), this, SLOT(showHideControlDock()));
......
...@@ -419,7 +419,7 @@ void View::init() ...@@ -419,7 +419,7 @@ void View::init()
// WALLPAPER // WALLPAPER
m_textureWallpaper = new Utils::Texture<2, Geom::Vec3uc>(GL_UNSIGNED_BYTE); m_textureWallpaper = new Utils::Texture<2, Geom::Vec3uc>(GL_UNSIGNED_BYTE);
m_textureWallpaper->create(Geom::Vec2ui(1024, 1024)); m_textureWallpaper->create(Geom::Vec2ui(16, 16));
const float max = m_textureWallpaper->size()[0]; const float max = m_textureWallpaper->size()[0];
for (unsigned int ki = 0; ki < m_textureWallpaper->size()[0]; ++ki) for (unsigned int ki = 0; ki < m_textureWallpaper->size()[0]; ++ki)
{ {
...@@ -457,14 +457,16 @@ void View::draw() ...@@ -457,14 +457,16 @@ void View::draw()
glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT); glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT);
} }
m_shaderWallpaper->draw();
const CameraSet& cams = m_schnapps->getCameraSet(); const CameraSet& cams = m_schnapps->getCameraSet();
QList<Camera*> lc = cams.values(); QList<Camera*> lc = cams.values();
foreach(Camera* camera, lc) foreach (Camera* camera, lc)
{ {
if(camera != m_currentCamera) if (camera != m_currentCamera)
{ {
if(camera->getDraw()) camera->draw(); if (camera->getDraw()) camera->draw();
if(camera->getDrawPath()) camera->drawAllPaths(); if (camera->getDrawPath()) camera->drawAllPaths();
} }
} }
...@@ -495,8 +497,6 @@ void View::draw() ...@@ -495,8 +497,6 @@ void View::draw()
foreach(PluginInteraction* plugin, l_plugins) foreach(PluginInteraction* plugin, l_plugins)
plugin->draw(this); plugin->draw(this);
m_shaderWallpaper->draw();
} }
void View::postDraw() void View::postDraw()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment