mirror of
https://gitlab.gnome.org/GNOME/gparted
synced 2024-08-27 11:40:03 +00:00
f8f9a72de6
Want functionality to prevent further child details being added to an
OperationDetail. This is so that the captured libparted error messages
are always the last child in the list, and more details (at that point
in the tree) can't be added.
For example we want GParted to report like this:
Move /dev/sdb3 to the right and shrink it from 1.14 GiB to...(SUCCESS)
...
* shrink partition from 1.14 GiB to 1.00 GiB (SUCCESS)
* old start: 4464640
old end: 6856703
old size: 2392064 (1.14 GiB)
* new start: 4464640
new end: 6561791
new size: 2097152 (1.00 GiB)
* libparted messages (INFO)
* DEBUG: GParted generated synthetic libparted excepti...
and not like this:
Move /dev/sdb3 to the right and shrink it from 1.14 GiB to...(SUCCESS)
...
* shrink partition from 1.14 GiB to 1.00 GiB (SUCCESS)
* old start: 4464640
old end: 6856703
old size: 2392064 (1.14 GiB)
* libparted messages (INFO)
* DEBUG: GParted generated synthetic libparted excepti...
* new start: 4464640
new end: 6561791
new size: 2097152 (1.00 GiB)
So actually preventing the addition of more child details would stop
users seeing information they should see. So instead just report a bug
message into the operation details. This doesn't stop anything, but the
bug message will be seen and allow us to fix GParted.
So far nothing is enforced. This patch just adds the mechanism to
report a bug when a new child detail is added when prohibited.
Bug 790842 - Report libparted messages into operation details at the
point at which they occur
101 lines
3 KiB
C++
101 lines
3 KiB
C++
/* Copyright (C) 2004 Bart 'plors' Hakvoort
|
|
* Copyright (C) 2008 Curtis Gedak
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GPARTED_OPERATIONDETAIL_H
|
|
#define GPARTED_OPERATIONDETAIL_H
|
|
|
|
#include "ProgressBar.h"
|
|
|
|
#include <glibmm/ustring.h>
|
|
#include <glibmm/markup.h>
|
|
|
|
#include <vector>
|
|
#include <ctime>
|
|
|
|
namespace GParted
|
|
{
|
|
|
|
enum OperationDetailStatus {
|
|
STATUS_NONE = 0,
|
|
STATUS_EXECUTE = 1,
|
|
STATUS_SUCCES = 2,
|
|
STATUS_ERROR = 3,
|
|
STATUS_INFO = 4,
|
|
STATUS_N_A = 5
|
|
};
|
|
|
|
enum Font {
|
|
FONT_NORMAL = 0,
|
|
FONT_BOLD = 1,
|
|
FONT_ITALIC = 2,
|
|
FONT_BOLD_ITALIC = 3
|
|
} ;
|
|
|
|
class OperationDetail
|
|
{
|
|
|
|
friend class Dialog_Progress; // To allow Dialog_Progress::on_signal_update() to call
|
|
// get_progressbar() and get direct access to the progress bar.
|
|
|
|
public:
|
|
OperationDetail() ;
|
|
~OperationDetail();
|
|
OperationDetail( const Glib::ustring & description,
|
|
OperationDetailStatus status = STATUS_EXECUTE,
|
|
Font font = FONT_NORMAL ) ;
|
|
void set_description( const Glib::ustring & description, Font font = FONT_NORMAL ) ;
|
|
Glib::ustring get_description() const ;
|
|
void set_status( OperationDetailStatus status ) ;
|
|
OperationDetailStatus get_status() const ;
|
|
void set_treepath( const Glib::ustring & treepath ) ;
|
|
Glib::ustring get_treepath() const ;
|
|
Glib::ustring get_elapsed_time() const ;
|
|
|
|
void add_child( const OperationDetail & operationdetail ) ;
|
|
std::vector<OperationDetail*> & get_childs() ;
|
|
const std::vector<OperationDetail*> & get_childs() const ;
|
|
OperationDetail & get_last_child() ;
|
|
void run_progressbar( double progress, double target, ProgressBar_Text text_mode = PROGRESSBAR_TEXT_NONE );
|
|
void stop_progressbar();
|
|
|
|
sigc::signal< void, const OperationDetail & > signal_update ;
|
|
sigc::signal< void, bool > signal_cancel;
|
|
char cancelflag;
|
|
|
|
private:
|
|
void add_child_implement( const OperationDetail & operationdetail );
|
|
void on_update( const OperationDetail & operationdetail ) ;
|
|
void cancel( bool force );
|
|
ProgressBar & get_progressbar() const;
|
|
|
|
Glib::ustring description ;
|
|
OperationDetailStatus status ;
|
|
|
|
Glib::ustring treepath ;
|
|
|
|
std::vector<OperationDetail*> sub_details;
|
|
std::time_t time_start, time_elapsed ;
|
|
bool no_more_children; // Disallow adding more children to ensure captured errors
|
|
// remain the last child of this operation detail.
|
|
|
|
sigc::connection cancelconnection;
|
|
};
|
|
|
|
} //GParted
|
|
|
|
#endif /* GPARTED_OPERATIONDETAIL_H */
|