Skip to content

Add a don't-show-again checkbox to the non-root-user initial dialog #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidemanini wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add a don't-show-again checkbox to the non-root-user initial dialog #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6032d7b
Add a don't-show-again checkbox to the non-root-user initial dialog
Jan 21, 2025
657ee7d
Make admin-privileges dialog coherent with welcome dialog. Fix POTFIL…
Feb 3, 2025
2ab8fa8
Make admin_privileges child of mainWindow
Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions gtk/gsynaptic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,19 @@ void welcome_dialog(RGMainWindow *mainWindow)
}
}

void admin_privileges_dialog(RGMainWindow *mainWindow)
{
if (_config->FindB("Synaptic::ShowAdminPrivilegesDialog", true)) {
RGGtkBuilderUserDialog dia(mainWindow);
dia.run("admin_privileges");
GtkWidget *cb = GTK_WIDGET(gtk_builder_get_object(dia.getGtkBuilder(),
"checkbutton_admin_privileges_not_show_again"));
assert(cb);
_config->Set("Synaptic::ShowAdminPrivilegesDialog",
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb)));
}
}

void update_check(RGMainWindow *mainWindow, RPackageLister *lister)
{
struct stat st;
Expand Down Expand Up @@ -429,18 +442,6 @@ int main(int argc, char **argv)
if (_config->FindB("help") == true)
ShowHelp(CmdL);

if (getuid() != 0) {
RGUserDialog userDialog;
userDialog.warning(g_strdup_printf("<b><big>%s</big></b>\n\n%s",
_("Starting \"Synaptic Package Manager\" without "
"administrative privileges"),
_("You will not be able to apply "
"any changes, but you can still "
"export the marked changes or "
"create a download script "
"for them.")));
}

if (!RInitConfiguration("synaptic.conf")) {
RGUserDialog userDialog;
userDialog.showErrors();
Expand Down Expand Up @@ -602,6 +603,9 @@ int main(int argc, char **argv)
if (NonInteractive) {
mainWindow->cbProceedClicked(NULL, mainWindow);
} else {
if (getuid() != 0) {
admin_privileges_dialog(mainWindow);
}
welcome_dialog(mainWindow);
gtk_widget_grab_focus( GTK_WIDGET(gtk_builder_get_object(
mainWindow->getGtkBuilder(),
Expand Down
164 changes: 164 additions & 0 deletions gtk/gtkbuilder/dialog_admin_privileges.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.40.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="dialog_admin_privileges">
<property name="can-focus">False</property>
<property name="border-width">6</property>
<property name="title" translatable="yes">Quick Introduction</property>
<property name="resizable">False</property>
<property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="layout-style">end</property>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="has-focus">True</property>
<property name="can-default">True</property>
<property name="receives-default">False</property>
<property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="yalign">0</property>
<property name="icon-name">dialog-warning</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkCheckButton" id="checkbutton_admin_privileges_not_show_again">
<property name="label" translatable="yes">Show this dialog at startup</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="valign">end</property>
<property name="use-underline">True</property>
<property name="xalign">0</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Starting "Synaptic Package Manager" without administrative privileges</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="scale" value="1.1000000000000001"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">You will not be able to apply any changes, but you can still export the marked changes or create a download script for them.</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-7">okbutton1</action-widget>
</action-widgets>
</object>
</interface>
6 changes: 6 additions & 0 deletions gtk/rguserdialog.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,12 @@ RGGtkBuilderUserDialog::RGGtkBuilderUserDialog(RGWindow *parent)
_parentWindow = parent->window();
}

RGGtkBuilderUserDialog::RGGtkBuilderUserDialog(const char *name)
{
_parentWindow = 0;
init(name);
}

void RGGtkBuilderUserDialog::init(const char *name)
{
gchar *main_widget = NULL;
Expand Down
1 change: 1 addition & 0 deletions gtk/rguserdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class RGGtkBuilderUserDialog : public RGUserDialog
public:
RGGtkBuilderUserDialog(RGWindow* parent);
RGGtkBuilderUserDialog(RGWindow* parent, const char *name);
RGGtkBuilderUserDialog(const char *name);
virtual ~RGGtkBuilderUserDialog() { gtk_widget_destroy(_dialog); };

void setTitle(string title) {
Expand Down
1 change: 1 addition & 0 deletions po/POTFILES.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ gtk/rgtaskswin.cc
[type: gettext/glade]gtk/gtkbuilder/dialog_authentication.ui
[type: gettext/glade]gtk/gtkbuilder/dialog_disc_label.ui
[type: gettext/glade]gtk/gtkbuilder/dialog_new_repositroy.ui
[type: gettext/glade]gtk/gtkbuilder/dialog_admin_privileges.ui
data/synaptic.desktop.in
data/com.ubuntu.pkexec.synaptic.policy.in
gtk/rgfiltermanager.h
Expand Down