ngscopeclient · May 18, 2020 · May 18, 2020
Showing with 31 additions and 0 deletions.

+2 −0 glscopeclient/HistoryWindow.cpp

+18 −0 glscopeclient/OscilloscopeWindow.cpp

+4 −0 glscopeclient/OscilloscopeWindow.h

+2 −0 glscopeclient/ProtocolAnalyzerWindow.cpp

+5 −0 glscopeclient/styles/glscopeclient.css
diff --git a/glscopeclient/HistoryWindow.cpp b/glscopeclient/HistoryWindow.cpp
@@ -57,6 +57,8 @@ HistoryWindow::HistoryWindow(OscilloscopeWindow* parent, Oscilloscope* scope)
 	, m_updating(false)
 {
 	set_title(string("History: ") + m_scope->m_nickname);
+	set_transient_for(*parent);
+	set_skip_taskbar_hint();
 
 	set_default_size(320, 800);
 

diff --git a/glscopeclient/OscilloscopeWindow.cpp b/glscopeclient/OscilloscopeWindow.cpp
@@ -52,6 +52,7 @@ using namespace std;
  */
 OscilloscopeWindow::OscilloscopeWindow(vector<Oscilloscope*> scopes)
 	: m_scopes(scopes)
+	, m_fullscreen(false)
 {
 	SetTitle();
 
@@ -269,6 +270,9 @@ void OscilloscopeWindow::CreateWidgets()
 				m_toolbar.append(m_btnClearSweeps, sigc::mem_fun(*this, &OscilloscopeWindow::OnClearSweeps));
 					m_btnClearSweeps.set_tooltip_text("Clear sweeps");
 					m_btnClearSweeps.set_icon_name("user-trash");
+				m_toolbar.append(m_btnFullscreen, sigc::mem_fun(*this, &OscilloscopeWindow::OnFullscreen));
+					m_btnFullscreen.set_tooltip_text("Fullscreen");
+					m_btnFullscreen.set_icon_name("view-fullscreen");
 				m_toolbar.append(*Gtk::manage(new Gtk::SeparatorToolItem));
 			m_toolbox.pack_start(m_alphalabel, Gtk::PACK_SHRINK);
 				m_alphalabel.set_label("Opacity ");
@@ -293,6 +297,7 @@ void OscilloscopeWindow::CreateWidgets()
 			split->pack1(group->m_frame);
 
 		m_vbox.pack_start(m_statusbar, Gtk::PACK_SHRINK);
+			m_statusbar.get_style_context()->add_class("status");
 			m_statusbar.pack_end(m_triggerConfigLabel, Gtk::PACK_SHRINK);
 			m_triggerConfigLabel.set_size_request(75, 1);
 			m_statusbar.pack_end(m_waveformRateLabel, Gtk::PACK_SHRINK);
@@ -1349,7 +1354,10 @@ void OscilloscopeWindow::OnHistory()
 	if(m_btnHistory.get_active())
 	{
 		for(auto it : m_historyWindows)
+		{
 			it.second->show();
+			it.second->grab_focus();
+		}
 	}
 	else
 	{
@@ -1554,6 +1562,16 @@ void OscilloscopeWindow::GarbageCollectGroups()
 	}
 }
 
+void OscilloscopeWindow::OnFullscreen()
+{
+	m_fullscreen = !m_fullscreen;
+
+	if(m_fullscreen)
+		fullscreen();
+	else
+		unfullscreen();
+}
+
 void OscilloscopeWindow::OnClearSweeps()
 {
 	//TODO: clear regular waveform data and history too?

diff --git a/glscopeclient/OscilloscopeWindow.h b/glscopeclient/OscilloscopeWindow.h
@@ -163,6 +163,7 @@ class OscilloscopeWindow	: public Gtk::Window
 				Gtk::ToggleToolButton m_btnHistory;
 				Gtk::ToolButton m_btnRefresh;
 				Gtk::ToolButton m_btnClearSweeps;
+				Gtk::ToolButton m_btnFullscreen;
 			Gtk::Label  m_alphalabel;
 			Gtk::HScale m_alphaslider;
 		//main app windows go here
@@ -201,6 +202,7 @@ class OscilloscopeWindow	: public Gtk::Window
 	void CloseSession();
 	void OnEyeColorChanged(EyeColor color, Gtk::RadioMenuItem* item);
 	void OnTriggerProperties(Oscilloscope* scope);
+	void OnFullscreen();
 	void OnClearSweeps();
 
 	//Protocol decoding etc
@@ -245,6 +247,8 @@ class OscilloscopeWindow	: public Gtk::Window
 
 	//WFM/s performance info
 	std::vector<double> m_lastWaveformTimes;
+
+	bool m_fullscreen;
 };
 
 #endif
diff --git a/glscopeclient/ProtocolAnalyzerWindow.cpp b/glscopeclient/ProtocolAnalyzerWindow.cpp
@@ -74,6 +74,8 @@ ProtocolAnalyzerWindow::ProtocolAnalyzerWindow(
 	, m_updating(false)
 {
 	set_title(title);
+	set_transient_for(*parent);
+	set_skip_taskbar_hint();
 
 	m_decoder->AddRef();
 

diff --git a/glscopeclient/styles/glscopeclient.css b/glscopeclient/styles/glscopeclient.css
@@ -77,3 +77,8 @@ label.toolbar
 {
 	color: white;
 }
+
+.status
+{
+	color: white;
+}
-Original file line number
+Diff line change
@@ @@ -77,3 +77,8 @@ label.toolbar @@
     {
     	color: white;
     }
+    .status
+    {
+    	color: white;
+    }