Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 09fcc9065af0
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 68e4a1e3f7b0
Choose a head ref
  • 1 commit
  • 23 files changed
  • 1 contributor

Commits on Jul 9, 2020

  1. Copy the full SHA
    68e4a1e View commit details
5 changes: 5 additions & 0 deletions glscopeclient/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -73,9 +73,14 @@ add_custom_target(
styles
COMMENT "Copying styles..."
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/styles ${CMAKE_BINARY_DIR}/src/glscopeclient/styles)
add_custom_target(
icons
COMMENT "Copying icons..."
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/icons ${CMAKE_BINARY_DIR}/src/glscopeclient/icons)

add_dependencies(glscopeclient
gradients
shaders
styles
icons
)
25 changes: 17 additions & 8 deletions glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -57,7 +57,9 @@ using namespace std;
@brief Initializes the main window
*/
OscilloscopeWindow::OscilloscopeWindow(vector<Oscilloscope*> scopes, bool nodigital)
: m_scopes(scopes)
: m_iconEnterFullscreen("icons/24x24/fullscreen-enter.png")
, m_iconExitFullscreen("icons/24x24/fullscreen-exit.png")
, m_scopes(scopes)
, m_fullscreen(false)
, m_multiScopeFreeRun(false)
, m_scopeSyncWizard(NULL)
@@ -257,27 +259,27 @@ void OscilloscopeWindow::CreateWidgets(bool nodigital)
m_toolbox.pack_start(m_toolbar, Gtk::PACK_EXPAND_WIDGET);
m_toolbar.append(m_btnStart, sigc::mem_fun(*this, &OscilloscopeWindow::OnStart));
m_btnStart.set_tooltip_text("Start (normal trigger)");
m_btnStart.set_icon_name("media-playback-start");
m_btnStart.set_icon_widget(*Gtk::manage(new Gtk::Image("icons/24x24/trigger-start.png")));
m_toolbar.append(m_btnStartSingle, sigc::mem_fun(*this, &OscilloscopeWindow::OnStartSingle));
m_btnStartSingle.set_tooltip_text("Start (single trigger)");
m_btnStartSingle.set_icon_name("media-skip-forward");
m_btnStartSingle.set_icon_widget(*Gtk::manage(new Gtk::Image("icons/24x24/trigger-single.png")));
m_toolbar.append(m_btnStop, sigc::mem_fun(*this, &OscilloscopeWindow::OnStop));
m_btnStop.set_tooltip_text("Stop trigger");
m_btnStop.set_icon_name("media-playback-stop");
m_btnStop.set_icon_widget(*Gtk::manage(new Gtk::Image("icons/24x24/trigger-stop.png")));
m_toolbar.append(*Gtk::manage(new Gtk::SeparatorToolItem));
m_toolbar.append(m_btnHistory, sigc::mem_fun(*this, &OscilloscopeWindow::OnHistory));
m_btnHistory.set_tooltip_text("History");
m_btnHistory.set_icon_name("search");
m_btnHistory.set_icon_widget(*Gtk::manage(new Gtk::Image("icons/24x24/history.png")));
m_toolbar.append(*Gtk::manage(new Gtk::SeparatorToolItem));
m_toolbar.append(m_btnRefresh, sigc::mem_fun(*this, &OscilloscopeWindow::OnRefreshConfig));
m_btnRefresh.set_tooltip_text("Reload configuration from scope");
m_btnRefresh.set_icon_name("reload");
m_btnRefresh.set_icon_widget(*Gtk::manage(new Gtk::Image("icons/24x24/refresh-settings.png")));
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_btnClearSweeps.set_icon_widget(*Gtk::manage(new Gtk::Image("icons/24x24/clear-sweeps.png")));
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_btnFullscreen.set_icon_widget(m_iconEnterFullscreen);
m_toolbar.append(*Gtk::manage(new Gtk::SeparatorToolItem));
m_toolbox.pack_start(m_alphalabel, Gtk::PACK_SHRINK);
m_alphalabel.set_label("Opacity ");
@@ -1699,6 +1701,10 @@ void OscilloscopeWindow::OnFullscreen()
//Enter fullscreen mode
if(m_fullscreen)
{
//Update toolbar button icon
m_btnFullscreen.set_icon_widget(m_iconExitFullscreen);
m_iconExitFullscreen.show();

int x;
int y;
get_position(x, y);
@@ -1726,6 +1732,9 @@ void OscilloscopeWindow::OnFullscreen()
set_decorated();
resize(m_originalRect.get_width(), m_originalRect.get_height());
move(m_originalRect.get_x(), m_originalRect.get_y());

//Update toolbar button icon
m_btnFullscreen.set_icon_widget(m_iconEnterFullscreen);
}
}

2 changes: 2 additions & 0 deletions glscopeclient/OscilloscopeWindow.h
Original file line number Diff line number Diff line change
@@ -167,6 +167,8 @@ class OscilloscopeWindow : public Gtk::Window
Gtk::ToolButton m_btnRefresh;
Gtk::ToolButton m_btnClearSweeps;
Gtk::ToolButton m_btnFullscreen;
Gtk::Image m_iconEnterFullscreen;
Gtk::Image m_iconExitFullscreen;
Gtk::Label m_alphalabel;
Gtk::HScale m_alphaslider;
//main app windows go here
Binary file added glscopeclient/icons/24x24/clear-sweeps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added glscopeclient/icons/24x24/fullscreen-enter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added glscopeclient/icons/24x24/fullscreen-exit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added glscopeclient/icons/24x24/history.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added glscopeclient/icons/24x24/refresh-settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added glscopeclient/icons/24x24/trigger-single.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added glscopeclient/icons/24x24/trigger-start.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added glscopeclient/icons/24x24/trigger-stop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Loading