RemoteDialog: Fixed incorrect parsing for local repositories

RemoteDialog/CloneDialog: UI Tweaks



FossilOrigin-Name: 9dd99f7de54ad40a15d80f9bf9af82a367c24302
This commit is contained in:
Kostas 2015-08-26 21:02:25 +00:00
parent 73731923d3
commit 5a4ed73777
5 changed files with 23 additions and 17 deletions

View File

@ -1,5 +1,5 @@
C Fixed\sissue\swith\sincosistent\sUI\sstate\swhen\sclosing\sa\sworkspace\nSimplified\sworkspace\srefresh\slogic
D 2015-08-26T20:28:00.267
C RemoteDialog:\sFixed\sincorrect\sparsing\sfor\slocal\srepositories\nRemoteDialog/CloneDialog:\sUI\sTweaks\n\n
D 2015-08-26T21:02:25.634
F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
@ -234,7 +234,7 @@ F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp 28f0155821d42c645c99fdd5214344c177cea3bc
F src/MainWindow.h 15f703522d1d6cd6239c8c8f037d158870b6b0b9
F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac
F src/RemoteDialog.cpp d5d39871f319bb760405736ba0caa9e83ec51ea3
F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79
F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73
@ -253,15 +253,15 @@ F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
F ui/AboutDialog.ui 6c96b147f0e8c5cf8190ce0e3c471e38e934d5c1
F ui/BrowserWidget.ui 994ad9ea0e9f5815d6b1a27acc2f6f39164c507f
F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
F ui/CloneDialog.ui d02d2fc6356cb7ff88860c1a6963d882c444b030
F ui/CommitDialog.ui 1e5dafa742e9ae07ec937bcda8cda3297ddc6199
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/FslSettingsDialog.ui eb3d4cb764cab90b01e82922237d8c42d6ce1749
F ui/MainWindow.ui e2a18caa7482b3ee0dff477592cdc9574b35fe4f
F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
P afa9b2538a0bfa258104a979eadce28c099e9848
R 8e7f8d9d9b9c83f269cd7044b0450be8
P 2e0cbf44fd99ae2c1155857c79d0c09be9897483
R 299d60964206bb133a79ab33106d5571
U Kostas
Z 3db267354ced0e1a65fb38289663a642
Z 15cc90ea1c477295b23c8c549ce6a6f7

View File

@ -1 +1 @@
2e0cbf44fd99ae2c1155857c79d0c09be9897483
9dd99f7de54ad40a15d80f9bf9af82a367c24302

View File

@ -41,11 +41,17 @@ bool RemoteDialog::run(QWidget *parent, QUrl &url, QString &name)
QString urltext = dlg.ui->lineURL->text();
url = QUrl::fromUserInput(urltext);
if(url.isEmpty() || !url.isValid())
// Check if the url is a local file
if(QFileInfo(urltext).exists())
url = QUrl::fromLocalFile(urltext);
else
{
QMessageBox::critical(parent, tr("Error"), tr("Invalid URL."), QMessageBox::Ok );
return false;
url = QUrl::fromUserInput(urltext);
if(url.isEmpty() || !url.isValid())
{
QMessageBox::critical(parent, tr("Error"), tr("Invalid URL."), QMessageBox::Ok );
return false;
}
}
if(!dlg.ui->lineUserName->text().trimmed().isEmpty())

View File

@ -28,7 +28,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_1">
<property name="text">
<string>URL</string>
<string>Remote Repository</string>
</property>
</widget>
</item>
@ -96,7 +96,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Repository</string>
<string>Local Repository</string>
</property>
</widget>
</item>

View File

@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>478</width>
<height>189</height>
<height>164</height>
</rect>
</property>
<property name="windowTitle">
@ -28,7 +28,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_1">
<property name="text">
<string>URL</string>
<string>Remote Repository</string>
</property>
</widget>
</item>