diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 7214e228d..49cc894d8 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -302,6 +302,7 @@ add_library(app-lib ui/file_list.cpp ui/file_selector.cpp ui/hex_color_entry.cpp + ui/home_view.cpp ui/keyboard_shortcuts.cpp ui/main_menu_bar.cpp ui/main_window.cpp @@ -320,7 +321,6 @@ add_library(app-lib ui/skin/skin_theme.cpp ui/skin/style.cpp ui/skin/style_sheet.cpp - ui/start_view.cpp ui/status_bar.cpp ui/styled_button.cpp ui/tabs.cpp diff --git a/src/app/ui/start_view.cpp b/src/app/ui/home_view.cpp similarity index 77% rename from src/app/ui/start_view.cpp rename to src/app/ui/home_view.cpp index 318ed7814..45fbbc2f5 100644 --- a/src/app/ui/start_view.cpp +++ b/src/app/ui/home_view.cpp @@ -9,7 +9,7 @@ #include "config.h" #endif -#include "app/ui/start_view.h" +#include "app/ui/home_view.h" #include "app/ui/skin/skin_theme.h" #include "ui/label.h" @@ -21,7 +21,7 @@ namespace app { using namespace ui; using namespace skin; -StartView::StartView() +HomeView::HomeView() : Box(JI_VERTICAL) { SkinTheme* theme = static_cast(getTheme()); @@ -34,26 +34,26 @@ StartView::StartView() addChild(label); } -StartView::~StartView() +HomeView::~HomeView() { } -std::string StartView::getTabText() +std::string HomeView::getTabText() { - return "Start"; + return "Home"; } -WorkspaceView* StartView::cloneWorkspaceView() +WorkspaceView* HomeView::cloneWorkspaceView() { return NULL; // This view cannot be cloned } -void StartView::onClonedFrom(WorkspaceView* from) +void HomeView::onClonedFrom(WorkspaceView* from) { ASSERT(false); // Never called } -void StartView::onWorkspaceViewSelected() +void HomeView::onWorkspaceViewSelected() { } diff --git a/src/app/ui/start_view.h b/src/app/ui/home_view.h similarity index 77% rename from src/app/ui/start_view.h rename to src/app/ui/home_view.h index 5d1fde1c3..05859c18f 100644 --- a/src/app/ui/start_view.h +++ b/src/app/ui/home_view.h @@ -5,8 +5,8 @@ // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. -#ifndef APP_UI_START_VIEW_H_INCLUDED -#define APP_UI_START_VIEW_H_INCLUDED +#ifndef APP_UI_HOME_VIEW_H_INCLUDED +#define APP_UI_HOME_VIEW_H_INCLUDED #pragma once #include "app/ui/tabs.h" @@ -18,12 +18,12 @@ namespace ui { } namespace app { - class StartView : public ui::Box - , public TabView - , public WorkspaceView { + class HomeView : public ui::Box + , public TabView + , public WorkspaceView { public: - StartView(); - ~StartView(); + HomeView(); + ~HomeView(); // TabView implementation std::string getTabText() override; diff --git a/src/app/ui/main_window.cpp b/src/app/ui/main_window.cpp index 322b368a5..b59ba1793 100644 --- a/src/app/ui/main_window.cpp +++ b/src/app/ui/main_window.cpp @@ -24,12 +24,12 @@ #include "app/ui/document_view.h" #include "app/ui/editor/editor.h" #include "app/ui/editor/editor_view.h" +#include "app/ui/home_view.h" #include "app/ui/main_menu_bar.h" #include "app/ui/notifications.h" #include "app/ui/preview_editor.h" #include "app/ui/skin/skin_property.h" #include "app/ui/skin/skin_theme.h" -#include "app/ui/start_view.h" #include "app/ui/status_bar.h" #include "app/ui/tabs.h" #include "app/ui/timeline.h" @@ -50,7 +50,7 @@ MainWindow::MainWindow() , m_lastSplitterPos(0.0) , m_lastTimelineSplitterPos(75.0) , m_mode(NormalMode) - , m_startView(NULL) + , m_homeView(NULL) { setId("main_window"); @@ -122,9 +122,9 @@ MainWindow::MainWindow() MainWindow::~MainWindow() { - if (m_startView) { - m_workspace->removeView(m_startView); - delete m_startView; + if (m_homeView) { + m_workspace->removeView(m_homeView); + delete m_homeView; } delete m_contextBar; delete m_previewEditor; @@ -220,9 +220,9 @@ void MainWindow::popTimeline() bool MainWindow::onProcessMessage(ui::Message* msg) { if (msg->type() == kOpenMessage) { - m_startView = new StartView; - m_workspace->addView(m_startView); - m_tabsBar->selectTab(m_startView); + m_homeView = new HomeView; + m_workspace->addView(m_homeView); + m_tabsBar->selectTab(m_homeView); } return Window::onProcessMessage(msg); diff --git a/src/app/ui/main_window.h b/src/app/ui/main_window.h index 8ace90c74..8c2e1a217 100644 --- a/src/app/ui/main_window.h +++ b/src/app/ui/main_window.h @@ -20,11 +20,11 @@ namespace app { class ColorBar; class ContextBar; + class HomeView; class INotificationDelegate; class MainMenuBar; - class PreviewEditorWindow; class Notifications; - class StartView; + class PreviewEditorWindow; class StatusBar; class Tabs; class Timeline; @@ -86,7 +86,7 @@ namespace app { Timeline* m_timeline; Workspace* m_workspace; PreviewEditorWindow* m_previewEditor; - StartView* m_startView; + HomeView* m_homeView; Notifications* m_notifications; };