Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fixed HeaderFrame icon to use correct one (Share Dialog)

Browse Source 
- Change Header Text/ Window Title when Share Dialog is in Edit mode.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-12-05 10:27:54 +00:00
parent d01745e54f
commit bf70038ad2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
retroshare-gui/src/gui/ShareDialog.cpp
View File

@ -42,7 +42,7 @@ ShareDialog::ShareDialog(std::string filename, QWidget *parent)
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
ui.headerFrame->setHeaderImage(QPixmap(":/images/fileshare48.png"));
ui.headerFrame->setHeaderImage(QPixmap(":/images/fileshare64.png"));
ui.headerFrame->setHeaderText(tr("Share Folder"));
connect(ui.browseButton, SIGNAL(clicked( bool ) ), this , SLOT( browseDirectory() ) );
@ -97,8 +97,10 @@ ShareDialog::ShareDialog(std::string filename, QWidget *parent)
ui.browseButton->setDisabled(true);
ui.virtualpath_lineEdit->setText(QString::fromUtf8(it->virtualname.c_str()));
groupflagsbox->setFlags(it->shareflags) ;
groupflagsbox->setFlags(it->shareflags) ;
groupselectionbox->setSelectedGroupIds(it->parent_groups) ;
ui.headerFrame->setHeaderText(tr("Edit Shared Folder"));
break;
}

3
retroshare-gui/src/gui/ShareManager.cpp
View File

@ -191,7 +191,7 @@ void ShareManager::updateFlags()
if(isLoading)
return ;
isLoading = true ; // stops GUI update. Otherwise each call to rsFiles->updateShareFlags() modifies the GUI that we count on to check
isLoading = true ; // stops GUI update. Otherwise each call to rsFiles->updateShareFlags() modifies the GUI that we count on to check
// what has changed => fail!
// std::cerr << "Updating flags" << std::endl;
@ -268,6 +268,7 @@ void ShareManager::editShareDirectory()
if (it->filename == filename) {
/* file name found, show dialog */
ShareDialog sharedlg (it->filename, this);
sharedlg.setWindowTitle(tr("Edit Shared Folder"));
sharedlg.exec();
break;
}