diff --git a/src/lay/SaltManagerDialog.ui b/src/lay/SaltManagerDialog.ui index a0d9944c6..ce1f690e6 100644 --- a/src/lay/SaltManagerDialog.ui +++ b/src/lay/SaltManagerDialog.ui @@ -19,6 +19,586 @@ 2 + + + Install New Packages + + + + + + + 0 + 1 + + + + Qt::Horizontal + + + + + 4 + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Mark or unmark for installation + + + Mark + + + + :/marked_16.png:/marked_16.png + + + true + + + + + + + Qt::Horizontal + + + + 126 + 20 + + + + + + + + + + + :/find.png + + + + + + + + 0 + 0 + + + + + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + + 64 + 64 + + + + false + + + + + + + + + + + + 1 + 0 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 4 + + + 0 + + + 0 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 75 + true + + + + Details + + + + + + + false + + + ... + + + + :/empty_16.png:/empty_16.png + + + true + + + + + + + + + + true + + + + + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Apply + + + false + + + false + + + + + + + Set in code + + + + + + + Qt::Horizontal + + + + 563 + 20 + + + + + + + + + + + + Update Packages + + + + + + + 0 + 1 + + + + Qt::Horizontal + + + + + 4 + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Mark or unmark for installation + + + Mark + + + + :/marked_16.png:/marked_16.png + + + true + + + + + + + Qt::Horizontal + + + + 126 + 20 + + + + + + + + + + + :/find.png + + + + + + + + 0 + 0 + + + + + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + + 64 + 64 + + + + false + + + + + + + + + + + + 1 + 0 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 4 + + + 0 + + + 0 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 75 + true + + + + Details + + + + + + + false + + + ... + + + + :/empty_16.png:/empty_16.png + + + true + + + + + + + + + + true + + + + + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Apply + + + false + + + false + + + + + + + Set in code + + + + + + + Qt::Horizontal + + + + 563 + 20 + + + + + + + + + Current Packages @@ -441,586 +1021,6 @@ - - - Update Packages - - - - - - - 0 - 1 - - - - Qt::Horizontal - - - - - 4 - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 2 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Mark or unmark for installation - - - Mark - - - - :/marked_16.png:/marked_16.png - - - true - - - - - - - Qt::Horizontal - - - - 126 - 20 - - - - - - - - - - - :/find.png - - - - - - - - 0 - 0 - - - - - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 64 - 64 - - - - false - - - - - - - - - - - - 1 - 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 4 - - - 0 - - - 0 - - - 0 - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 75 - true - - - - Details - - - - - - - false - - - ... - - - - :/empty_16.png:/empty_16.png - - - true - - - - - - - - - - true - - - - - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Apply - - - false - - - false - - - - - - - Set in code - - - - - - - Qt::Horizontal - - - - 563 - 20 - - - - - - - - - - - - Install New Packages - - - - - - - 0 - 1 - - - - Qt::Horizontal - - - - - 4 - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 2 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Mark or unmark for installation - - - Mark - - - - :/marked_16.png:/marked_16.png - - - true - - - - - - - Qt::Horizontal - - - - 126 - 20 - - - - - - - - - - - :/find.png - - - - - - - - 0 - 0 - - - - - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 64 - 64 - - - - false - - - - - - - - - - - - 1 - 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 4 - - - 0 - - - 0 - - - 0 - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 75 - true - - - - Details - - - - - - - false - - - ... - - - - :/empty_16.png:/empty_16.png - - - true - - - - - - - - - - true - - - - - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Apply - - - false - - - false - - - - - - - Set in code - - - - - - - Qt::Horizontal - - - - 563 - 20 - - - - - - - - - @@ -1065,11 +1065,6 @@ Show marked only - - - Show all - - Refresh @@ -1078,11 +1073,6 @@ Reload package repository - - - Show all - - Show marked only @@ -1093,6 +1083,41 @@ Unmark all + + + Mark for Installation + + + + + Unmark + + + + + Mark for update + + + + + Unmark + + + + + Create package + + + + + Mark all + + + + + Mark all + + diff --git a/src/lay/laySaltGrainDetailsTextWidget.cc b/src/lay/laySaltGrainDetailsTextWidget.cc index 59ea4f260..6849e5e16 100644 --- a/src/lay/laySaltGrainDetailsTextWidget.cc +++ b/src/lay/laySaltGrainDetailsTextWidget.cc @@ -36,16 +36,20 @@ namespace lay { SaltGrainDetailsTextWidget::SaltGrainDetailsTextWidget (QWidget *w) - : QTextBrowser (w), mp_grain (0) + : QTextBrowser (w), mp_grain () { setOpenLinks (false); setOpenExternalLinks (false); connect (this, SIGNAL (anchorClicked (const QUrl &)), this, SLOT (open_link (const QUrl &))); } -void SaltGrainDetailsTextWidget::set_grain (SaltGrain *g) +void SaltGrainDetailsTextWidget::set_grain (const SaltGrain *g) { - mp_grain = g; + if (g) { + mp_grain.reset (new SaltGrain (*g)); + } else { + mp_grain.reset (0); + } setHtml (details_text ()); } @@ -62,7 +66,7 @@ SaltGrainDetailsTextWidget::loadResource (int type, const QUrl &url) int icon_dim = 64; - if (!mp_grain || mp_grain->icon ().isNull ()) { + if (!mp_grain.get () || mp_grain->icon ().isNull ()) { return QImage (":/salt_icon.png"); @@ -161,7 +165,7 @@ static void produce_listing (QTextStream &stream, QDir dir, int level) QString SaltGrainDetailsTextWidget::details_text () { - SaltGrain *g = mp_grain; + SaltGrain *g = mp_grain.get (); if (! g) { return QString (); } diff --git a/src/lay/laySaltGrainDetailsTextWidget.h b/src/lay/laySaltGrainDetailsTextWidget.h index 6ba47f144..c0c93a724 100644 --- a/src/lay/laySaltGrainDetailsTextWidget.h +++ b/src/lay/laySaltGrainDetailsTextWidget.h @@ -24,6 +24,7 @@ #define HDR_laySaltGrainDetailsTextWidget #include +#include namespace lay { @@ -47,7 +48,7 @@ public: /** * @brief Sets the grain whose details are to be shown */ - void set_grain (SaltGrain *g); + void set_grain (const SaltGrain *g); protected: virtual QVariant loadResource (int type, const QUrl &url); @@ -56,7 +57,7 @@ private slots: void open_link (const QUrl &url); private: - lay::SaltGrain *mp_grain; + std::auto_ptr mp_grain; QString details_text (); }; diff --git a/src/lay/laySaltManagerDialog.cc b/src/lay/laySaltManagerDialog.cc index d71be4edb..c3fd2ced7 100644 --- a/src/lay/laySaltManagerDialog.cc +++ b/src/lay/laySaltManagerDialog.cc @@ -118,6 +118,10 @@ SaltManagerDialog::SaltManagerDialog (QWidget *parent, lay::Salt *salt, const st Ui::SaltManagerDialog::setupUi (this); mp_properties_dialog = new lay::SaltGrainPropertiesDialog (this); + // TODO: clarify where the delete button should go ... currently it's too easy to + // mistake add and delete buttons + delete_button->hide (); + connect (edit_button, SIGNAL (clicked ()), this, SLOT (edit_properties ())); connect (create_button, SIGNAL (clicked ()), this, SLOT (create_grain ())); connect (delete_button, SIGNAL (clicked ()), this, SLOT (delete_grain ())); @@ -136,6 +140,7 @@ SaltManagerDialog::SaltManagerDialog (QWidget *parent, lay::Salt *salt, const st } SaltModel *model = new SaltModel (this, mp_salt); + model->set_empty_explanation (tr ("No packages are present on this system")); salt_view->setModel (model); salt_view->setItemDelegate (new SaltItemDelegate (this)); @@ -143,15 +148,17 @@ SaltManagerDialog::SaltManagerDialog (QWidget *parent, lay::Salt *salt, const st // This model will show only the grains of mp_salt_mine which are not present in mp_salt yet. mine_model = new SaltModel (this, &m_salt_mine, mp_salt, true); + mine_model->set_empty_explanation (tr ("All available packages are installed")); salt_mine_view_new->setModel (mine_model); salt_mine_view_new->setItemDelegate (new SaltItemDelegate (this)); // This model will show only the grains of mp_salt_mine which are present in mp_salt already. mine_model = new SaltModel (this, &m_salt_mine, mp_salt, false); + mine_model->set_empty_explanation (tr ("No packages are installed")); salt_mine_view_update->setModel (mine_model); salt_mine_view_update->setItemDelegate (new SaltItemDelegate (this)); - mode_tab->setCurrentIndex (mp_salt->is_empty () ? 1 : 0); + mode_tab->setCurrentIndex (0); connect (mode_tab, SIGNAL (currentChanged (int)), this, SLOT (mode_changed ())); m_current_tab = mode_tab->currentIndex (); @@ -182,37 +189,57 @@ SaltManagerDialog::SaltManagerDialog (QWidget *parent, lay::Salt *salt, const st QAction *a; + salt_view->addAction (actionCreatePackage); + salt_view->addAction (actionDelete); + salt_view->setContextMenuPolicy (Qt::ActionsContextMenu); + + salt_mine_view_new->addAction (actionMarkNew); + salt_mine_view_new->addAction (actionMarkAllNew); + salt_mine_view_new->addAction (actionUnmarkNew); salt_mine_view_new->addAction (actionUnmarkAllNew); a = new QAction (this); a->setSeparator (true); salt_mine_view_new->addAction (a); salt_mine_view_new->addAction (actionShowMarkedOnlyNew); - salt_mine_view_new->addAction (actionShowAllNew); + actionShowMarkedOnlyNew->setCheckable (true); a = new QAction (this); a->setSeparator (true); salt_mine_view_new->addAction (a); salt_mine_view_new->addAction (actionRefresh); salt_mine_view_new->setContextMenuPolicy (Qt::ActionsContextMenu); + salt_mine_view_update->addAction (actionMarkForUpdate); + salt_mine_view_update->addAction (actionMarkAllUpdate); + salt_mine_view_update->addAction (actionUnmarkForUpdate); salt_mine_view_update->addAction (actionUnmarkAllUpdate); a = new QAction (this); a->setSeparator (true); salt_mine_view_update->addAction (a); salt_mine_view_update->addAction (actionShowMarkedOnlyUpdate); - salt_mine_view_update->addAction (actionShowAllUpdate); + actionShowMarkedOnlyUpdate->setCheckable (true); a = new QAction (this); a->setSeparator (true); salt_mine_view_update->addAction (a); salt_mine_view_update->addAction (actionRefresh); salt_mine_view_update->setContextMenuPolicy (Qt::ActionsContextMenu); + connect (actionCreatePackage, SIGNAL (triggered ()), this, SLOT (create_grain ())); + connect (actionDelete, SIGNAL (triggered ()), this, SLOT (delete_grain ())); connect (actionUnmarkAllNew, SIGNAL (triggered ()), this, SLOT (unmark_all_new ())); + connect (actionMarkAllNew, SIGNAL (triggered ()), this, SLOT (mark_all_new ())); connect (actionShowMarkedOnlyNew, SIGNAL (triggered ()), this, SLOT (show_marked_only_new ())); - connect (actionShowAllNew, SIGNAL (triggered ()), this, SLOT (show_all_new ())); connect (actionUnmarkAllUpdate, SIGNAL (triggered ()), this, SLOT (unmark_all_update ())); + connect (actionMarkAllUpdate, SIGNAL (triggered ()), this, SLOT (mark_all_update ())); connect (actionShowMarkedOnlyUpdate, SIGNAL (triggered ()), this, SLOT (show_marked_only_update ())); - connect (actionShowAllUpdate, SIGNAL (triggered ()), this, SLOT (show_all_update ())); connect (actionRefresh, SIGNAL (triggered ()), this, SLOT (refresh ())); + connect (actionMarkNew, SIGNAL (triggered ()), this, SLOT (mark_clicked ())); + connect (actionUnmarkNew, SIGNAL (triggered ()), this, SLOT (mark_clicked ())); + connect (actionMarkForUpdate, SIGNAL (triggered ()), this, SLOT (mark_clicked ())); + connect (actionUnmarkForUpdate, SIGNAL (triggered ()), this, SLOT (mark_clicked ())); + + mine_update_current_changed (); + mine_new_current_changed (); + current_changed (); } void @@ -222,11 +249,11 @@ SaltManagerDialog::mode_changed () setFocus (Qt::NoFocusReason); QList sizes; - if (m_current_tab == 0) { + if (m_current_tab == 2) { sizes = splitter->sizes (); } else if (m_current_tab == 1) { sizes = splitter_update->sizes (); - } else if (m_current_tab == 2) { + } else if (m_current_tab == 0) { sizes = splitter_new->sizes (); } @@ -237,45 +264,22 @@ SaltManagerDialog::mode_changed () splitter->setSizes (sizes); } - if (mode_tab->currentIndex () >= 1) { - show_all_new (); - show_all_update (); + actionShowMarkedOnlyNew->setChecked (false); + actionShowMarkedOnlyUpdate->setChecked (false); + + if (mode_tab->currentIndex () < 2) { + show_marked_only_new (); + show_marked_only_update (); } m_current_tab = mode_tab->currentIndex (); } -void -SaltManagerDialog::show_all_new () -{ - search_new_edit->clear (); - - SaltModel *model = dynamic_cast (salt_mine_view_new->model ()); - if (model) { - for (int i = model->rowCount (QModelIndex ()); i > 0; ) { - --i; - salt_mine_view_new->setRowHidden (i, false); - } - } -} - -void -SaltManagerDialog::show_all_update () -{ - search_update_edit->clear (); - - SaltModel *model = dynamic_cast (salt_mine_view_update->model ()); - if (model) { - for (int i = model->rowCount (QModelIndex ()); i > 0; ) { - --i; - salt_mine_view_update->setRowHidden (i, false); - } - } -} - void SaltManagerDialog::show_marked_only_new () { + bool show_marked_only = actionShowMarkedOnlyNew->isChecked (); + search_new_edit->clear (); SaltModel *model = dynamic_cast (salt_mine_view_new->model ()); @@ -288,7 +292,7 @@ SaltManagerDialog::show_marked_only_new () for (int i = model->rowCount (QModelIndex ()); i > 0; ) { --i; SaltGrain *g = model->grain_from_index (model->index (i, 0, QModelIndex ())); - salt_mine_view_new->setRowHidden (i, !(g && model->is_marked (g->name ()))); + salt_mine_view_new->setRowHidden (i, show_marked_only && !(g && model->is_marked (g->name ()))); mine_new_current_changed (); } } @@ -296,6 +300,8 @@ SaltManagerDialog::show_marked_only_new () void SaltManagerDialog::show_marked_only_update () { + bool show_marked_only = actionShowMarkedOnlyUpdate->isChecked (); + search_update_edit->clear (); SaltModel *model = dynamic_cast (salt_mine_view_update->model ()); @@ -308,7 +314,7 @@ SaltManagerDialog::show_marked_only_update () for (int i = model->rowCount (QModelIndex ()); i > 0; ) { --i; SaltGrain *g = model->grain_from_index (model->index (i, 0, QModelIndex ())); - salt_mine_view_update->setRowHidden (i, !(g && model->is_marked (g->name ()))); + salt_mine_view_update->setRowHidden (i, show_marked_only && !(g && model->is_marked (g->name ()))); mine_update_current_changed (); } } @@ -319,7 +325,20 @@ SaltManagerDialog::unmark_all_new () SaltModel *model = dynamic_cast (salt_mine_view_new->model ()); if (model) { model->clear_marked (); - show_all_new (); + actionShowMarkedOnlyNew->setChecked (false); + show_marked_only_new (); + update_apply_state (); + } +} + +void +SaltManagerDialog::mark_all_new () +{ + SaltModel *model = dynamic_cast (salt_mine_view_new->model ()); + if (model) { + model->mark_all (); + actionShowMarkedOnlyNew->setChecked (false); + show_marked_only_new (); update_apply_state (); } } @@ -330,7 +349,20 @@ SaltManagerDialog::unmark_all_update () SaltModel *model = dynamic_cast (salt_mine_view_update->model ()); if (model) { model->clear_marked (); - show_all_update (); + actionShowMarkedOnlyUpdate->setChecked (false); + show_marked_only_update (); + update_apply_state (); + } +} + +void +SaltManagerDialog::mark_all_update () +{ + SaltModel *model = dynamic_cast (salt_mine_view_update->model ()); + if (model) { + model->mark_all (); + actionShowMarkedOnlyUpdate->setChecked (false); + show_marked_only_update (); update_apply_state (); } } @@ -380,12 +412,15 @@ void SaltManagerDialog::mark_clicked () { QListView *view; - if (sender () == salt_mine_view_new || sender () == mark_new_button) { + if (sender () == salt_mine_view_new || sender () == mark_new_button || sender () == actionMarkNew || sender () == actionUnmarkNew) { view = salt_mine_view_new; } else { view = salt_mine_view_update; } + bool toggle = (sender () != actionMarkNew && sender () != actionUnmarkNew && sender () != actionMarkForUpdate && sender () != actionUnmarkForUpdate); + bool set = (sender () == actionMarkNew || sender () == actionMarkForUpdate); + SaltModel *model = dynamic_cast (view->model ()); if (! model) { return; @@ -393,7 +428,7 @@ SaltManagerDialog::mark_clicked () SaltGrain *g = model->grain_from_index (view->currentIndex ()); if (g) { - model->set_marked (g->name (), ! model->is_marked (g->name ())); + model->set_marked (g->name (), toggle ? ! model->is_marked (g->name ()) : set); update_apply_state (); } } @@ -632,6 +667,9 @@ SaltManagerDialog::salt_mine_changed () void SaltManagerDialog::update_models () { + actionShowMarkedOnlyNew->setChecked (false); + actionShowMarkedOnlyUpdate->setChecked (false); + SaltModel *model = dynamic_cast (salt_view->model ()); tl_assert (model != 0); @@ -771,8 +809,7 @@ BEGIN_PROTECTED details_update_frame->setEnabled (g != 0); - SaltGrain *remote_grain = get_remote_grain_info (g, details_update_text); - m_remote_update_grain.reset (remote_grain); + get_remote_grain_info (g, details_update_text); END_PROTECTED } @@ -788,21 +825,19 @@ BEGIN_PROTECTED details_new_frame->setEnabled (g != 0); - SaltGrain *remote_grain = get_remote_grain_info (g, details_new_text); - m_remote_new_grain.reset (remote_grain); + get_remote_grain_info (g, details_new_text); END_PROTECTED } -lay::SaltGrain * +void SaltManagerDialog::get_remote_grain_info (lay::SaltGrain *g, SaltGrainDetailsTextWidget *details) { if (! g) { - return 0; + return; } std::auto_ptr remote_grain; - remote_grain.reset (0); // Download actual grain definition file try { @@ -863,8 +898,6 @@ SaltManagerDialog::get_remote_grain_info (lay::SaltGrain *g, SaltGrainDetailsTex details->setHtml (html); } - - return remote_grain.release (); } } diff --git a/src/lay/laySaltManagerDialog.h b/src/lay/laySaltManagerDialog.h index 88493198d..07f8820c1 100644 --- a/src/lay/laySaltManagerDialog.h +++ b/src/lay/laySaltManagerDialog.h @@ -125,31 +125,31 @@ private slots: */ void show_marked_only_new (); - /** - * @brief Called to show all items again (new packages tab) - */ - void show_all_new (); - /** * @brief Called to unmark all items (new packages tab) */ void unmark_all_new (); + /** + * @brief Called to mark all items (new packages tab) + */ + void mark_all_new (); + /** * @brief Called to show the marked items only (update packages tab) */ void show_marked_only_update (); - /** - * @brief Called to show all items again (update packages tab) - */ - void show_all_update (); - /** * @brief Called to unmark all items (update packages tab) */ void unmark_all_update (); + /** + * @brief Called to mark all items (update packages tab) + */ + void mark_all_update (); + /** * @brief Reloads the salt mine */ @@ -159,8 +159,6 @@ private: Salt *mp_salt; Salt m_salt_mine; std::string m_salt_mine_url; - std::auto_ptr m_remote_update_grain; - std::auto_ptr m_remote_new_grain; SaltGrainPropertiesDialog *mp_properties_dialog; tl::DeferredMethod dm_update_models; int m_current_tab; @@ -168,7 +166,7 @@ private: SaltGrain *current_grain (); void update_models (); void update_apply_state (); - SaltGrain *get_remote_grain_info (lay::SaltGrain *g, SaltGrainDetailsTextWidget *details); + void get_remote_grain_info (lay::SaltGrain *g, SaltGrainDetailsTextWidget *details); }; } diff --git a/src/lay/laySaltModel.cc b/src/lay/laySaltModel.cc index 078582186..b1686c27f 100644 --- a/src/lay/laySaltModel.cc +++ b/src/lay/laySaltModel.cc @@ -40,6 +40,8 @@ SaltItemDelegate::SaltItemDelegate (QObject *parent) // .. nothing yet .. } +const int textWidth = 500; + void SaltItemDelegate::paint (QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { @@ -69,15 +71,14 @@ SaltItemDelegate::paint (QPainter *painter, const QStyleOptionViewItem &option, painter->save (); painter->translate (textRect.topLeft ()); painter->setClipRect (textRect.translated (-textRect.topLeft ())); - doc.documentLayout()->draw (painter, ctx); + doc.setTextWidth (textWidth); + doc.documentLayout ()->draw (painter, ctx); painter->restore (); } QSize SaltItemDelegate::sizeHint (const QStyleOptionViewItem &option, const QModelIndex &index) const { - const int textWidth = 500; - QStyleOptionViewItemV4 optionV4 = option; initStyleOption (&optionV4, index); @@ -103,13 +104,19 @@ SaltModel::SaltModel (QObject *parent, lay::Salt *salt, lay::Salt *salt_filtered create_ordered_list (); } +void +SaltModel::set_empty_explanation (const QString &text) +{ + m_empty_explanation = text; +} + Qt::ItemFlags SaltModel::flags (const QModelIndex &index) const { Qt::ItemFlags f = QAbstractItemModel::flags (index); const lay::SaltGrain *g = grain_from_index (index); - if (g && ! is_enabled (g->name ())) { + if (! g /*|| ! is_enabled (g->name ())*/) { f &= ~Qt::ItemIsSelectable; f &= ~Qt::ItemIsEnabled; } @@ -124,10 +131,15 @@ SaltModel::data (const QModelIndex &index, int role) const const lay::SaltGrain *g = grain_from_index (index); if (!g) { - return QVariant (); + return QVariant (tr ("

There are no items to show in this list

%1

").arg (m_empty_explanation)); } + bool en = is_enabled (g->name ()); + std::string text = ""; + if (! en) { + text += ""; + } text += "

"; text += tl::escaped_to_html (g->name ()); if (!g->version ().empty ()) { @@ -156,6 +168,9 @@ SaltModel::data (const QModelIndex &index, int role) const } } + if (! en) { + text += ""; + } text += ""; return tl::to_qstring (text); @@ -245,7 +260,7 @@ SaltModel::rowCount (const QModelIndex &parent) const if (parent.isValid ()) { return 0; } else { - return int (m_ordered_grains.size ()); + return std::max (1, int (m_ordered_grains.size ())); } } @@ -293,6 +308,16 @@ SaltModel::clear_marked () } } +void +SaltModel::mark_all () +{ + m_marked.clear (); + for (std::vector::const_iterator g = m_ordered_grains.begin (); g != m_ordered_grains.end (); ++g) { + m_marked.insert ((*g)->name ()); + } + emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ())); +} + void SaltModel::set_enabled (const std::string &name, bool enabled) { diff --git a/src/lay/laySaltModel.h b/src/lay/laySaltModel.h index ea6f02a2a..607cb5317 100644 --- a/src/lay/laySaltModel.h +++ b/src/lay/laySaltModel.h @@ -111,6 +111,11 @@ public: */ void update (); + /** + * @brief Sets the explanation text for an empty list (i.e. "there are no new packages") + */ + void set_empty_explanation (const QString &text); + /** * @brief Sets or resets the "marked" flag on the grain with the given name */ @@ -121,6 +126,11 @@ public: */ void clear_marked (); + /** + * @brief Sets the marked state of all grains + */ + void mark_all (); + /** * @brief Enables or disables the grain with the given name */ @@ -178,6 +188,7 @@ public: std::map m_display_order; std::vector m_ordered_grains; bool m_in_update; + QString m_empty_explanation; bool is_marked (const std::string &name) const; bool is_enabled (const std::string &name) const; diff --git a/src/tl/tlSystemPaths.cc b/src/tl/tlSystemPaths.cc index 02cf90860..75343718e 100644 --- a/src/tl/tlSystemPaths.cc +++ b/src/tl/tlSystemPaths.cc @@ -167,7 +167,7 @@ get_klayout_path () std::string salt_mine_url () { - const std::string default_url ("https://sami.klayout.org/repository.xml"); + const std::string default_url ("http://sami.klayout.org/repository.xml"); #ifdef _WIN32 wchar_t *env = _wgetenv (L"KLAYOUT_SALT_MINE");