Changeset View
Changeset View
Standalone View
Standalone View
shell/openprojectdialog.cpp
Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Line(s) | 117 | openPage->setHeader(QStringLiteral("<font color='%1'>%2</font>") | |||
---|---|---|---|---|---|
118 | .arg(scheme.foreground(KColorScheme::NegativeText).color().name(), errorMsg) | 118 | .arg(scheme.foreground(KColorScheme::NegativeText).color().name(), errorMsg) | ||
119 | ); | 119 | ); | ||
120 | setAppropriate( projectInfoPage, false ); | 120 | setAppropriate( projectInfoPage, false ); | ||
121 | setAppropriate( openPage, true ); | 121 | setAppropriate( openPage, true ); | ||
122 | setValid( openPage, false ); | 122 | setValid( openPage, false ); | ||
123 | return; | 123 | return; | ||
124 | } | 124 | } | ||
125 | 125 | | |||
126 | m_selected = url; | ||||
mwolff: add newline after | |||||
127 | | ||||
126 | if( isDir || extension != ShellExtension::getInstance()->projectFileExtension() ) | 128 | if( isDir || extension != ShellExtension::getInstance()->projectFileExtension() ) | ||
127 | { | 129 | { | ||
128 | setAppropriate( projectInfoPage, true ); | 130 | setAppropriate( projectInfoPage, true ); | ||
129 | m_url = url; | 131 | m_url = url; | ||
130 | if( !isDir ) { | 132 | if( !isDir ) { | ||
131 | m_url = m_url.adjusted(QUrl::StripTrailingSlash | QUrl::RemoveFilename); | 133 | m_url = m_url.adjusted(QUrl::StripTrailingSlash | QUrl::RemoveFilename); | ||
132 | } | 134 | } | ||
133 | ProjectInfoPage* page = qobject_cast<ProjectInfoPage*>( projectInfoPage->widget() ); | 135 | ProjectInfoPage* page = qobject_cast<ProjectInfoPage*>( projectInfoPage->widget() ); | ||
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s) | 207 | { | |||
207 | validateProjectInfo(); | 209 | validateProjectInfo(); | ||
208 | } | 210 | } | ||
209 | 211 | | |||
210 | QUrl OpenProjectDialog::projectFileUrl() | 212 | QUrl OpenProjectDialog::projectFileUrl() | ||
211 | { | 213 | { | ||
212 | return m_url; | 214 | return m_url; | ||
213 | } | 215 | } | ||
214 | 216 | | |||
217 | QUrl OpenProjectDialog::selectedUrl() const | ||||
mwolff: const, the other methods should also be const (separate patch) | |||||
218 | { | ||||
219 | return m_selected; | ||||
220 | } | ||||
221 | | ||||
215 | QString OpenProjectDialog::projectName() | 222 | QString OpenProjectDialog::projectName() | ||
216 | { | 223 | { | ||
217 | return m_projectName; | 224 | return m_projectName; | ||
218 | } | 225 | } | ||
219 | 226 | | |||
220 | QString OpenProjectDialog::projectManager() | 227 | QString OpenProjectDialog::projectManager() | ||
221 | { | 228 | { | ||
222 | return m_projectManager; | 229 | return m_projectManager; | ||
Show All 17 Lines |
add newline after