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: a00bd0076b10
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: c47117874765
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 18, 2020

  1. build: copy shaders/gradients/CSS even if nothing else has changed

    @azonenberg
    azonenberg committed May 18, 2020
    Copy the full SHA
    838d484 View commit details

  2. Switched toolbar and splitter bars to dark theme

    @azonenberg
    azonenberg committed May 18, 2020
    Copy the full SHA
    c471178 View commit details
Showing with 58 additions and 9 deletions.
  1. +17 −5 glscopeclient/CMakeLists.txt
  2. +3 −0 glscopeclient/OscilloscopeWindow.cpp
  3. +38 −4 glscopeclient/styles/glscopeclient.css
22 changes: 17 additions & 5 deletions glscopeclient/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -45,9 +45,21 @@ target_link_libraries(glscopeclient
###############################################################################
#Copy the resources to the build directory

add_custom_command(TARGET glscopeclient COMMENT "Copying gradients..." POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/gradients ${CMAKE_BINARY_DIR}/src/glscopeclient/gradients)

add_custom_command(TARGET glscopeclient COMMENT "Copying shaders..." POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/shaders ${CMAKE_BINARY_DIR}/src/glscopeclient/shaders)

add_custom_command(TARGET glscopeclient COMMENT "Copying styles..." POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/styles ${CMAKE_BINARY_DIR}/src/glscopeclient/styles)
add_custom_target(
gradients
COMMENT "Copying gradients..."
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/gradients ${CMAKE_BINARY_DIR}/src/glscopeclient/gradients)
add_custom_target(
shaders
COMMENT "Copying shaders..."
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/shaders ${CMAKE_BINARY_DIR}/src/glscopeclient/shaders)
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_dependencies(glscopeclient
gradients
shaders
styles
)
3 changes: 3 additions & 0 deletions glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -247,6 +247,7 @@ void OscilloscopeWindow::CreateWidgets()
m_channelsMenuItem.set_label("Add");
m_channelsMenuItem.set_submenu(m_channelsMenu);
m_vbox.pack_start(m_toolbox, Gtk::PACK_SHRINK);
m_vbox.get_style_context()->add_class("toolbar");
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)");
@@ -271,6 +272,7 @@ void OscilloscopeWindow::CreateWidgets()
m_toolbar.append(*Gtk::manage(new Gtk::SeparatorToolItem));
m_toolbox.pack_start(m_alphalabel, Gtk::PACK_SHRINK);
m_alphalabel.set_label("Opacity ");
m_alphalabel.get_style_context()->add_class("toolbar");
m_toolbox.pack_start(m_alphaslider, Gtk::PACK_SHRINK);
m_alphaslider.set_size_request(200, 10);
m_alphaslider.set_round_digits(3);
@@ -281,6 +283,7 @@ void OscilloscopeWindow::CreateWidgets()
m_alphaslider.set_value(0.5);
m_alphaslider.signal_value_changed().connect(
sigc::mem_fun(*this, &OscilloscopeWindow::OnAlphaChanged));
m_alphaslider.get_style_context()->add_class("toolbar");

auto split = new Gtk::HPaned;
m_vbox.pack_start(*split);
42 changes: 38 additions & 4 deletions glscopeclient/styles/glscopeclient.css
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
frame
{
color: white;
background-color: black;
background-color: #101010;
}

treeview
{
color: white;
background-color: black;
background-color: #101010;
background-image: none;
font-family: monospace;
}
@@ -31,15 +31,49 @@ row:hover,
row:hover:focus,
.cell:hover
{
background-color: #202020;
background-color: #101010;
}

treeview header button
{
color: white;
background-color: black;
background-color: #101010;
background-image: none;
border-top: none;
border-left: none;
border-right: none;
}

paned > separator
{
background-color: #101010;
border: none;
}

.toolbar
{
background-color: #101010;
}

toolbar button:hover
{
background-image: none;
background-color: #505050;
}

toolbar button:hover:active
{
background-image: none;
background-color: #808080;
}

toolbar button:focus
{
border-color: #202020;
border-image: none;
}

label.toolbar
{
color: white;
}