Move some files

VTX-Molecular-Visualization · Jul 16, 2024 · 8146b23 · 8146b23
1 parent 076ac7a
commit 8146b23
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 32 deletions.
diff --git a/lib/ui/qt/include/qt/application.hpp b/lib/ui/qt/include/qt/application.hpp
@@ -1,7 +1,7 @@
 #ifndef __VTX_UI_QT_APPLICATION__
 #define __VTX_UI_QT_APPLICATION__
 
-#include "main_window.hpp"
+#include "widget/main_window.hpp"
 #include <QApplication>
 #include <QPointer>
 #include <QSettings>
@@ -16,7 +16,7 @@ namespace VTX::UI::QT
 	inline QSettings SETTINGS
 		= QSettings( QString::fromStdString( App::Filesystem::getConfigIniFile().string() ), QSettings::IniFormat );
 
-	class Application final : public UI::BaseApplication<MainWindow>, QApplication
+	class Application final : public UI::BaseApplication<Widget::MainWindow>, QApplication
 	{
 	  public:
 		Application();

diff --git a/lib/ui/qt/include/qt/main_window.hpp → lib/ui/qt/include/qt/widget/main_window.hpp b/lib/ui/qt/include/qt/main_window.hpp → lib/ui/qt/include/qt/widget/main_window.hpp
@@ -1,8 +1,8 @@
-#ifndef __VTX_UI_QT_MAIN_WINDOW__
-#define __VTX_UI_QT_MAIN_WINDOW__
+#ifndef __VTX_UI_QT_WIDGET_MAIN_WINDOW__
+#define __VTX_UI_QT_WIDGET_MAIN_WINDOW__
 
-#include "base_widget.hpp"
-#include "helper.hpp"
+#include "qt/base_widget.hpp"
+#include "qt/helper.hpp"
 #include "opengl_widget.hpp"
 #include "status_bar.hpp"
 #include "ui/concepts.hpp"
@@ -13,7 +13,7 @@
 #include <ui/actions.hpp>
 #include <util/logger.hpp>
 
-namespace VTX::UI::QT
+namespace VTX::UI::QT::Widget
 {
 
 	class MainWindow : public BaseWidget<MainWindow, QMainWindow>

diff --git a/lib/ui/qt/include/qt/opengl_widget.hpp → ...ui/qt/include/qt/widget/opengl_widget.hpp b/lib/ui/qt/include/qt/opengl_widget.hpp → ...ui/qt/include/qt/widget/opengl_widget.hpp
@@ -1,5 +1,5 @@
-#ifndef __VTX_UI_QT_OPENGL_WIDGET__
-#define __VTX_UI_QT_OPENGL_WIDGET__
+#ifndef __VTX_UI_QT_WIDGET_OPENGL_WIDGET__
+#define __VTX_UI_QT_WIDGET_OPENGL_WIDGET__
 
 #include "qt/base_widget.hpp"
 #include <QOpenGLContext>
@@ -9,7 +9,7 @@
 #include <QResizeEvent>
 #include <QWindow>
 
-namespace VTX::UI::QT
+namespace VTX::UI::QT::Widget
 {
 	// Reimplement a custom OpenGL widget to avoid the use of QOpenGLWidget.
 	class OpenGLWidget : public QT::BaseWidget<OpenGLWidget, QWidget>

diff --git a/lib/ui/qt/include/qt/status_bar.hpp → lib/ui/qt/include/qt/widget/status_bar.hpp b/lib/ui/qt/include/qt/status_bar.hpp → lib/ui/qt/include/qt/widget/status_bar.hpp
@@ -1,13 +1,13 @@
-#ifndef __VTX_UI_QT_STATUS_BAR__
-#define __VTX_UI_QT_STATUS_BAR__
+#ifndef __VTX_UI_QT_WIDGET_STATUS_BAR__
+#define __VTX_UI_QT_WIDGET_STATUS_BAR__
 
 #include "qt/base_widget.hpp"
 #include <QLabel>
 #include <QPointer>
 #include <QStatusBar>
 #include <QTimer>
 
-namespace VTX::UI::QT
+namespace VTX::UI::QT::Widget
 {
 
 	class StatusBar : public BaseWidget<StatusBar, QStatusBar>
@@ -17,6 +17,6 @@ namespace VTX::UI::QT
 		virtual ~StatusBar() {}
 	};
 
-} // namespace VTX::UI::QT
+} // namespace VTX::UI::QT::Widget
 
 #endif
diff --git a/lib/ui/qt/src/qt/application.cpp b/lib/ui/qt/src/qt/application.cpp
@@ -1,7 +1,7 @@
 #include "qt/application.hpp"
-#include "qt/main_window.hpp"
 #include "qt/menu/file.hpp"
 #include "qt/resources.hpp"
+#include "qt/widget/main_window.hpp"
 #include <QApplication>
 #include <QFile>
 #include <QIcon>
@@ -19,7 +19,7 @@ namespace VTX::UI::QT
 
 	// Create QApplication with zero argc and nullptr argv.
 	int zero = 0;
-	Application::Application() : UI::BaseApplication<MainWindow>(), QApplication( zero, nullptr )
+	Application::Application() : UI::BaseApplication<Widget::MainWindow>(), QApplication( zero, nullptr )
 
 	{
 		using namespace Resources;

diff --git a/lib/ui/qt/src/qt/dialog/download.cpp b/lib/ui/qt/src/qt/dialog/download.cpp
@@ -3,7 +3,7 @@
 namespace VTX::UI::QT::Dialog
 {
 
-	Download::Download() : BaseWidget<Download, QDialog>( WIDGET<MainWindow>() )
+	Download::Download() : BaseWidget<Download, QDialog>( WIDGET<Widget::MainWindow>() )
 	{
 		setWindowTitle( "Download" );
 		// TODO: try size policy?

diff --git a/lib/ui/qt/src/qt/line_edit/command_launcher.cpp b/lib/ui/qt/src/qt/line_edit/command_launcher.cpp
@@ -7,7 +7,7 @@ namespace VTX::UI::QT::LineEdit
 {
 	CommandLauncher::CommandLauncher( QWidget * p_parent ) : BaseWidget( p_parent )
 	{
-		setPlaceholderText( ">" );
+		setPlaceholderText( "/command" );
 		_setupCompleter();
 		setCompleter( _completer );
 		setClearButtonEnabled( true );

diff --git a/lib/ui/qt/src/qt/menu/theme.cpp b/lib/ui/qt/src/qt/menu/theme.cpp
@@ -1,12 +1,12 @@
 #include "qt/menu/theme.hpp"
-#include "qt/main_window.hpp"
+#include "qt/widget/main_window.hpp"
 
 namespace VTX::UI::QT::Menu
 {
 
 	void Theme::_resetLayout()
 	{
-		WIDGET<MainWindow>()->resetLayout();
+		WIDGET<Widget::MainWindow>()->resetLayout();
 		VTX_DEBUG( "Layout reseted" );
 	}
 

diff --git a/lib/ui/qt/src/qt/main_window.cpp → lib/ui/qt/src/qt/widget/main_window.cpp b/lib/ui/qt/src/qt/main_window.cpp → lib/ui/qt/src/qt/widget/main_window.cpp
@@ -1,4 +1,4 @@
-#include "qt/main_window.hpp"
+#include "qt/widget/main_window.hpp"
 #include "qt/dock_widget/console.hpp"
 #include "qt/dock_widget/inspector.hpp"
 #include "qt/dock_widget/options.hpp"
@@ -15,7 +15,7 @@
 #include "qt/tool_bar/file.hpp"
 #include "qt/tool_bar/snapshot.hpp"
 
-namespace VTX::UI::QT
+namespace VTX::UI::QT::Widget
 {
 
 	MainWindow::MainWindow() : BaseWidget<MainWindow, QMainWindow>( nullptr ), _inputManager( App::INPUT_MANAGER() )
@@ -144,4 +144,4 @@ namespace VTX::UI::QT
 		p_event->accept();
 		QApplication::quit();
 	}
-} // namespace VTX::UI::QT
+} // namespace VTX::UI::QT::Widget
diff --git a/lib/ui/qt/src/qt/opengl_widget.cpp → lib/ui/qt/src/qt/widget/opengl_widget.cpp b/lib/ui/qt/src/qt/opengl_widget.cpp → lib/ui/qt/src/qt/widget/opengl_widget.cpp
@@ -1,6 +1,6 @@
-#include "qt/opengl_widget.hpp"
+#include "qt/widget/opengl_widget.hpp"
 
-namespace VTX::UI::QT
+namespace VTX::UI::QT::Widget
 {
 
 	OpenGLWidget::OpenGLWidget( QWidget * p_parent ) : BaseWidget( p_parent )
@@ -11,9 +11,9 @@ namespace VTX::UI::QT
 		format.setProfile( QSurfaceFormat::CoreProfile );
 		format.setRenderableType( QSurfaceFormat::OpenGL );
 		format.setSwapBehavior( QSurfaceFormat::DoubleBuffer );
-		format.setSwapInterval( 0 );
-		// format.setDepthBufferSize( 24 );
-		// format.setStencilBufferSize( 8 );
+		// format.setSwapInterval( 0 );
+		//  format.setDepthBufferSize( 24 );
+		//  format.setStencilBufferSize( 8 );
 
 		// format.setRedBufferSize( 32 );
 		// format.setGreenBufferSize( 32 );
@@ -108,4 +108,4 @@ namespace VTX::UI::QT
 		*/
 	}
 
-} // namespace VTX::UI::QT
+} // namespace VTX::UI::QT::Widget
diff --git a/lib/ui/qt/src/qt/status_bar.cpp → lib/ui/qt/src/qt/widget/status_bar.cpp b/lib/ui/qt/src/qt/status_bar.cpp → lib/ui/qt/src/qt/widget/status_bar.cpp
@@ -1,9 +1,9 @@
-#include "qt/status_bar.hpp"
+#include "qt/widget/status_bar.hpp"
 #include "app/internal/monitoring/all_metrics.hpp"
 #include <app/application/system/renderer.hpp>
 #include <app/vtx_app.hpp>
 
-namespace VTX::UI::QT
+namespace VTX::UI::QT::Widget
 {
 
 	StatusBar::StatusBar( QWidget * p_parent ) : BaseWidget<StatusBar, QStatusBar>( p_parent )
@@ -42,4 +42,4 @@ namespace VTX::UI::QT
 		timer->start( 1000 );
 	}
 
-} // namespace VTX::UI::QT
+} // namespace VTX::UI::QT::Widget