Skip to content

Commit

Permalink
Port xconfig to Qt5 - Put back some of the old implementation.
Browse files Browse the repository at this point in the history 
Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
  • Loading branch information
@bokic
bokic authored and Michal Marek committed Oct 14, 2015
1 parent 1019f1a commit 59e5644
Show file tree
Hide file tree
Showing 2 changed files with 216 additions and 18 deletions.
121 changes: 106 additions & 15 deletions scripts/kconfig/qconf.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,31 @@ bool ConfigSettings::writeSizes(const QString& key, const QList<int>& value)
for (it = value.begin(); it != value.end(); ++it)
stringList.push_back(QString::number(*it));
setValue(key, stringList);

return true;
}


/*
* set the new data
* TODO check the value
*/
void ConfigItem::okRename(int col)
{
}

/*
* update the displayed of a menu entry
*/
void ConfigItem::updateMenu(void)
{
}

void ConfigItem::testUpdateMenu(bool v)
{
}


/*
* construct a menu entry
*/
Expand Down Expand Up @@ -133,9 +155,92 @@ void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
}

ConfigList::ConfigList(ConfigView* p, const char *name)
: Parent(p)
: Parent(p),
updateAll(false),
symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod), symbolNoPix(xpm_symbol_no),
choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no),
menuPix(xpm_menu), menuInvPix(xpm_menu_inv), menuBackPix(xpm_menuback), voidPix(xpm_void),
showName(false), showRange(false), showData(false), optMode(normalOpt),
rootEntry(0), headerPopup(0)
{
}

void ConfigList::reinit(void)
{
}

void ConfigList::saveSettings(void)
{
}

ConfigItem* ConfigList::findConfigItem(struct menu *menu)
{
}

void ConfigList::updateSelection(void)
{
}

void ConfigList::updateList(ConfigItem* item)
{
}

void ConfigList::setValue(ConfigItem* item, tristate val)
{
}

void ConfigList::changeValue(ConfigItem* item)
{
}

void ConfigList::setRootMenu(struct menu *menu)
{
}

void ConfigList::setParentMenu(void)
{
}

/*
* update all the children of a menu entry
* removes/adds the entries from the parent widget as necessary
*
* parent: either the menu list widget or a menu entry widget
* menu: entry to be updated
*/
template <class P>
void ConfigList::updateMenuList(P* parent, struct menu* menu)
{
}

void ConfigList::keyPressEvent(QKeyEvent* ev)
{
}

void ConfigList::contentsMousePressEvent(QMouseEvent* e)
{
}

void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e)
{
}

void ConfigList::contentsMouseMoveEvent(QMouseEvent* e)
{
}

void ConfigList::contentsMouseDoubleClickEvent(QMouseEvent* e)
{
}

void ConfigList::focusInEvent(QFocusEvent *e)
{
}

void ConfigList::contextMenuEvent(QContextMenuEvent *e)
{
}

ConfigView*ConfigView::viewList;
QAction *ConfigView::showNormalAction;
QAction *ConfigView::showAllAction;
Expand Down Expand Up @@ -206,11 +311,6 @@ ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)

void ConfigInfoView::saveSettings(void)
{
/*if (name()) {
configSettings->beginGroup(name());
configSettings->setValue("/showDebug", showDebug());
configSettings->endGroup();
}*/
}

void ConfigInfoView::setShowDebug(bool b)
Expand Down Expand Up @@ -480,15 +580,6 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam

void ConfigSearchWindow::saveSettings(void)
{
/*if (name()) {
configSettings->beginGroup(name());
configSettings->setValue("/window x", pos().x());
configSettings->setValue("/window y", pos().y());
configSettings->setValue("/window width", size().width());
configSettings->setValue("/window height", size().height());
configSettings->writeSizes("/split", split->sizes());
configSettings->endGroup();
}*/
}

void ConfigSearchWindow::search(void)
Expand Down
113 changes: 110 additions & 3 deletions scripts/kconfig/qconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,81 @@ class ConfigList : public QTreeWidget {
typedef class QTreeWidget Parent;
public:
ConfigList(ConfigView* p, const char *name = 0);
void reinit(void);
ConfigView* parent(void) const
{
return (ConfigView*)Parent::parent();
}
ConfigItem* findConfigItem(struct menu *);

protected:
void keyPressEvent(QKeyEvent *e);
void contentsMousePressEvent(QMouseEvent *e);
void contentsMouseReleaseEvent(QMouseEvent *e);
void contentsMouseMoveEvent(QMouseEvent *e);
void contentsMouseDoubleClickEvent(QMouseEvent *e);
void focusInEvent(QFocusEvent *e);
void contextMenuEvent(QContextMenuEvent *e);

public slots:
void setRootMenu(struct menu *menu);

void updateList(ConfigItem *item);
void setValue(ConfigItem* item, tristate val);
void changeValue(ConfigItem* item);
void updateSelection(void);
void saveSettings(void);
signals:
void menuChanged(struct menu *menu);
void menuSelected(struct menu *menu);
void parentSelected(void);
void gotFocus(struct menu *);

public:
void updateListAll(void)
{
updateAll = true;
updateList(NULL);
updateAll = false;
}
ConfigList* listView()
{
return this;
}
ConfigItem* firstChild() const
{
// TODO: Implement me.
return NULL;
}
void addColumn(colIdx idx, const QString& label)
{
// TODO: Implement me.
}
void removeColumn(colIdx idx)
{
// TODO: Implement me.
}
void setAllOpen(bool open);
void setParentMenu(void);

bool menuSkip(struct menu *);

template <class P>
void updateMenuList(P*, struct menu*);

bool updateAll;

QPixmap symbolYesPix, symbolModPix, symbolNoPix;
QPixmap choiceYesPix, choiceNoPix;
QPixmap menuPix, menuInvPix, menuBackPix, voidPix;

bool showName, showRange, showData;
enum listMode mode;
enum optionMode optMode;
struct menu *rootEntry;
QPalette disabledColorGroup;
QPalette inactivedColorGroup;
QMenu* headerPopup;
};

class ConfigItem : public QTreeWidgetItem {
Expand All @@ -66,6 +141,38 @@ class ConfigItem : public QTreeWidgetItem {
}
~ConfigItem(void);
void init(void);
void okRename(int col);
void updateMenu(void);
void testUpdateMenu(bool v);
ConfigList* listView() const
{
return (ConfigList*)Parent::treeWidget();
}
ConfigItem* firstChild() const
{
return (ConfigItem *)Parent::child(0);
}
ConfigItem* nextSibling() const
{
return NULL; // TODO: Implement me
}
void setText(colIdx idx, const QString& text)
{
Parent::setText(idx, text);
}
QString text(colIdx idx) const
{
return Parent::text(idx);
}
void setPixmap(colIdx idx, const QPixmap& pm)
{
// TODO: Implement me
}
const QPixmap* pixmap(colIdx idx) const
{
return NULL; // TODO: Implement me
}
// Implement paintCell

ConfigItem* nextItem;
struct menu *menu;
Expand Down Expand Up @@ -98,9 +205,9 @@ class ConfigView : public QWidget {
static void updateList(ConfigItem* item);
static void updateListAll(void);

bool showName(void) const { return false; } // TODO: Implement me.
bool showRange(void) const { return false; } // TODO: Implement me.
bool showData(void) const { return false; } // TODO: Implement me.
bool showName(void) const { return list->showName; }
bool showRange(void) const { return list->showRange; }
bool showData(void) const { return list->showData; }
public slots:
void setShowName(bool);
void setShowRange(bool);
Expand Down

0 comments on commit 59e5644

Please sign in to comment.