Commit 513b6105 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Style change on WRev 'New Revision' dialog.

parent 1b3ec333
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
#include <QApplication> #include <QApplication>
#include <QTimer> #include <QTimer>
extern int DEBUG;
Wtt* WbQt::wtt_new(const char* name, const char* iconname, Wtt* WbQt::wtt_new(const char* name, const char* iconname,
ldh_tWBContext ldhwbctx, pwr_tVolumeId volid, ldh_tVolume volctx, ldh_tWBContext ldhwbctx, pwr_tVolumeId volid, ldh_tVolume volctx,
wnav_sStartMenu* root_menu, pwr_tStatus* status) wnav_sStartMenu* root_menu, pwr_tStatus* status)
...@@ -91,6 +93,7 @@ int main(int argc, char* argv[]) ...@@ -91,6 +93,7 @@ int main(int argc, char* argv[])
WbQt::WbQt(int argc, char* argv[]) : mainwindow(0) WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
{ {
DEBUG=1;
pwr_tStatus sts; pwr_tStatus sts;
int login_display = 0; int login_display = 0;
int nav_display = 0; int nav_display = 0;
......
...@@ -136,11 +136,16 @@ void WbBckWQtWidget::focusInEvent(QFocusEvent* event) ...@@ -136,11 +136,16 @@ void WbBckWQtWidget::focusInEvent(QFocusEvent* event)
void WbBckWQtWidget::closeEvent(QCloseEvent* event) void WbBckWQtWidget::closeEvent(QCloseEvent* event)
{ {
debug_print("WbBckWQtWidget::closeEvent\n");
delete bck; delete bck;
QWidget::closeEvent(event); QWidget::closeEvent(event);
} }
WbBckWQt::~WbBckWQt()
{
if (bckwnav)
delete bckwnav;
}
void WbBckWQt::set_title(char* title) void WbBckWQt::set_title(char* title)
{ {
toplevel->setWindowTitle(QString::fromLatin1(title)); toplevel->setWindowTitle(QString::fromLatin1(title));
......
...@@ -50,6 +50,7 @@ public: ...@@ -50,6 +50,7 @@ public:
WbBckWQt(void* l_parent_ctx, QWidget* l_parent_wid, ldh_tSession l_ldhses, WbBckWQt(void* l_parent_ctx, QWidget* l_parent_wid, ldh_tSession l_ldhses,
const char* l_name, wb_bck_list* l_list, int l_editmode, const char* l_name, wb_bck_list* l_list, int l_editmode,
pwr_tStatus* status); pwr_tStatus* status);
~WbBckWQt();
QWidget* nav_widget; QWidget* nav_widget;
QWidget* file_transfer_wb; QWidget* file_transfer_wb;
......
...@@ -46,19 +46,15 @@ WbBckWNavQt::WbBckWNavQt(void* l_parent_ctx, QWidget* l_parent_wid, ...@@ -46,19 +46,15 @@ WbBckWNavQt::WbBckWNavQt(void* l_parent_ctx, QWidget* l_parent_wid,
ldh_tSession l_ldhses, wb_bck_list* l_list, int l_editmode, QWidget** w) ldh_tSession l_ldhses, wb_bck_list* l_list, int l_editmode, QWidget** w)
: WbBckWNav(l_parent_ctx, l_ldhses, l_list, l_editmode) : WbBckWNav(l_parent_ctx, l_ldhses, l_list, l_editmode)
{ {
debug_print("creating a scrolledbrowwidgetqt\n");
form_widget form_widget
= scrolledbrowwidgetqt_new(WbBckWNav::init_brow_cb, this, &brow_widget); = scrolledbrowwidgetqt_new(WbBckWNav::init_brow_cb, this, &brow_widget);
showNow(brow_widget);
// Create the root item // Create the root item
*w = form_widget; *w = form_widget;
} }
WbBckWNavQt::~WbBckWNavQt() WbBckWNavQt::~WbBckWNavQt()
{ {
debug_print("WbBckWNavQt::~WbBckWNavQt\n");
form_widget->close(); form_widget->close();
} }
......
...@@ -280,7 +280,7 @@ WRevInputDialog::WRevInputDialog(WRevQt* parent_ctx, QWidget* parent, ...@@ -280,7 +280,7 @@ WRevInputDialog::WRevInputDialog(WRevQt* parent_ctx, QWidget* parent,
const char* init_text2) const char* init_text2)
: QDialog(parent), rev(parent_ctx) : QDialog(parent), rev(parent_ctx)
{ {
setMinimumSize(350, 150); setMinimumWidth(350);
setWindowTitle(fl("New Revision")); setWindowTitle(fl("New Revision"));
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
...@@ -301,15 +301,15 @@ WRevInputDialog::WRevInputDialog(WRevQt* parent_ctx, QWidget* parent, ...@@ -301,15 +301,15 @@ WRevInputDialog::WRevInputDialog(WRevQt* parent_ctx, QWidget* parent,
QHBoxLayout* hboxtext1 = new QHBoxLayout(); QHBoxLayout* hboxtext1 = new QHBoxLayout();
hboxtext1->addWidget(india_label1); hboxtext1->addWidget(india_label1);
add_expanding(hboxtext1, india_text1); hboxtext1->addWidget(india_text1);
QHBoxLayout* hboxtext2 = new QHBoxLayout(); QHBoxLayout* hboxtext2 = new QHBoxLayout();
hboxtext2->addWidget(india_label2); hboxtext2->addWidget(india_label2);
add_expanding(hboxtext2, india_text2); hboxtext2->addWidget(india_text2);
QVBoxLayout* vbox = new QVBoxLayout(); QVBoxLayout* vbox = new QVBoxLayout();
add_expanding(vbox, hboxtext1); vbox->addLayout(hboxtext1);
add_expanding(vbox, hboxtext2); vbox->addLayout(hboxtext2);
vbox->addWidget(separator(QFrame::HLine)); vbox->addWidget(separator(QFrame::HLine));
vbox->addWidget(buttons); vbox->addWidget(buttons);
setLayout(vbox); setLayout(vbox);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment