Skip to content
Browse files

Finished removal of webtab

  • Loading branch information...
1 parent b787635 commit 14154e6423b8fb710a4f8493f9dc1b901aa7f28c @bmcdorman bmcdorman committed
Showing with 12 additions and 7 deletions.
  1. +0 −7 src/main_window.cpp
  2. +12 −0 ui/MainWindow.ui
View
7 src/main_window.cpp
@@ -87,7 +87,6 @@ MainWindow::MainWindow(QWidget *parent)
// ui_projects->hide(); // Disabled for now
- /* Turns off updates so all of these things are drawn at once */
setUpdatesEnabled(false);
/* Deletes the tab that QTabWidget starts with by default */
@@ -303,12 +302,6 @@ void MainWindow::initMenus()
m_menuManager.registerMenus(targetMenu);
m_menuables.append(targetMenu);
-#ifdef BUILD_WEB_TAB
- WebTabMenu* webTabMenu = new WebTabMenu;
- m_menuManager.registerMenus(webTabMenu);
- m_menuables.append(webTabMenu);
-#endif
-
#ifdef BUILD_DEVELOPER_TOOLS
DeveloperMenu* developerMenu = new DeveloperMenu(this);
m_menuManager.registerMenus(developerMenu);
View
12 ui/MainWindow.ui
@@ -71,6 +71,9 @@
<property name="elideMode">
<enum>Qt::ElideRight</enum>
</property>
+ <property name="usesScrollButtons">
+ <bool>false</bool>
+ </property>
<property name="tabsClosable">
<bool>false</bool>
</property>
@@ -223,6 +226,12 @@
<property name="windowTitle">
<string>toolBar</string>
</property>
+ <property name="movable">
+ <bool>false</bool>
+ </property>
+ <property name="allowedAreas">
+ <set>Qt::TopToolBarArea</set>
+ </property>
<property name="iconSize">
<size>
<width>16</width>
@@ -232,6 +241,9 @@
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
+ <property name="floatable">
+ <bool>false</bool>
+ </property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>

0 comments on commit 14154e6

Please sign in to comment.
Something went wrong with that request. Please try again.