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: e703604034e4
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: cf8eadd18a03
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jul 30, 2020

  1. Updated scopeprotocols with measurement bug fixes. Fixed missing them…

    …e revert in file chooser dialog
    azonenberg committed Jul 30, 2020
    Copy the full SHA
    cf8eadd View commit details
Showing with 1 addition and 10 deletions.
  1. +1 −1 lib
  2. +0 −9 src/glscopeclient/OscilloscopeWindow.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 03f12c to 5ca71d
9 changes: 0 additions & 9 deletions src/glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -1104,11 +1104,6 @@ void OscilloscopeWindow::OnFileSave(bool saveToCurrentFile, bool saveLayout, boo
if(saveWaveforms)
title += "Waveforms";

//Remove the CSS provider so the dialog isn't themed
//TODO: how can we un-theme just this one dialog?
get_style_context()->remove_provider_for_screen(
Gdk::Screen::get_default(), m_css);

Gtk::FileChooserDialog dlg(*this, title, Gtk::FILE_CHOOSER_ACTION_SAVE);

auto filter = Gtk::FileFilter::create();
@@ -1121,10 +1116,6 @@ void OscilloscopeWindow::OnFileSave(bool saveToCurrentFile, bool saveLayout, boo
dlg.set_do_overwrite_confirmation();
auto response = dlg.run();

//Re-add the CSS provider
get_style_context()->add_provider_for_screen(
Gdk::Screen::get_default(), m_css, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

if(response != Gtk::RESPONSE_OK)
return;