Use CSS style sheet.
Avoid confusing text behind default transparent popup.
This commit is contained in:
@@ -58,6 +58,12 @@ K7Main::K7Main(const WEnvironment& env)
|
|||||||
OwnerTrustLevel[GpgME::Key::OwnerTrust::Unknown] = TR("UidUnknown");
|
OwnerTrustLevel[GpgME::Key::OwnerTrust::Unknown] = TR("UidUnknown");
|
||||||
m_uploader = NULL; m_deleter = NULL;
|
m_uploader = NULL; m_deleter = NULL;
|
||||||
m_keyEdit = new KeyEdit(this);
|
m_keyEdit = new KeyEdit(this);
|
||||||
|
|
||||||
|
WLink link;
|
||||||
|
const WString cssFile = WApplication::appRoot() + _APPNAME_
|
||||||
|
+ WString(".css");
|
||||||
|
link.setUrl(cssFile.toUTF8());
|
||||||
|
WApplication::useStyleSheet(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
K7Main::~K7Main()
|
K7Main::~K7Main()
|
||||||
|
|||||||
@@ -44,6 +44,8 @@ void PopupCertifyUserId::Create(vector<WString>& privateKeys,
|
|||||||
{
|
{
|
||||||
m_fprKeyToSign = fprKeyToSign;
|
m_fprKeyToSign = fprKeyToSign;
|
||||||
m_cwMain = static_cast<WContainerWidget*> (implementation());
|
m_cwMain = static_cast<WContainerWidget*> (implementation());
|
||||||
|
// White in css file, like default background color.
|
||||||
|
m_cwMain->setStyleClass("popup");
|
||||||
|
|
||||||
WVBoxLayout * vblMain = new WVBoxLayout();
|
WVBoxLayout * vblMain = new WVBoxLayout();
|
||||||
m_cwMain->setLayout(unique_ptr<WVBoxLayout> (vblMain));
|
m_cwMain->setLayout(unique_ptr<WVBoxLayout> (vblMain));
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ Deleter::~Deleter() {
|
|||||||
|
|
||||||
void Deleter::Create() {
|
void Deleter::Create() {
|
||||||
m_cwMain = static_cast<WContainerWidget*> (implementation());
|
m_cwMain = static_cast<WContainerWidget*> (implementation());
|
||||||
|
// White in css file, like default background color.
|
||||||
|
m_cwMain->setStyleClass("popup");
|
||||||
WVBoxLayout * vblMain = new WVBoxLayout();
|
WVBoxLayout * vblMain = new WVBoxLayout();
|
||||||
m_cwMain->setLayout(unique_ptr<WVBoxLayout> (vblMain));
|
m_cwMain->setLayout(unique_ptr<WVBoxLayout> (vblMain));
|
||||||
m_cbConfirm = new WCheckBox(TR("Confirm"));
|
m_cbConfirm = new WCheckBox(TR("Confirm"));
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ void Uploader::Create() {
|
|||||||
m_upload->setFileTextSize(10240); // Is really approximate
|
m_upload->setFileTextSize(10240); // Is really approximate
|
||||||
m_upload->setMultiple(false);
|
m_upload->setMultiple(false);
|
||||||
m_cwMain = static_cast<WContainerWidget*> (implementation());
|
m_cwMain = static_cast<WContainerWidget*> (implementation());
|
||||||
|
// White in css file, like default background color.
|
||||||
|
m_cwMain->setStyleClass("popup");
|
||||||
WVBoxLayout * vblMain = new WVBoxLayout();
|
WVBoxLayout * vblMain = new WVBoxLayout();
|
||||||
m_cwMain->setLayout(unique_ptr<WVBoxLayout> (vblMain));
|
m_cwMain->setLayout(unique_ptr<WVBoxLayout> (vblMain));
|
||||||
vblMain->addWidget(unique_ptr<WFileUpload> (m_upload));
|
vblMain->addWidget(unique_ptr<WFileUpload> (m_upload));
|
||||||
|
|||||||
10
WTAPPROOT/K7/K7.css
Normal file
10
WTAPPROOT/K7/K7.css
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Default page color is white.
|
||||||
|
* Default popup background is transparent.
|
||||||
|
* Can't use inherit :
|
||||||
|
* root()->decorationStyle().backgroundColor().{red,green, blue}
|
||||||
|
* are all 0.
|
||||||
|
*/
|
||||||
|
div.popup {
|
||||||
|
background-color: lavender;
|
||||||
|
}
|
||||||
@@ -52,6 +52,17 @@
|
|||||||
kind="IMPORTANT_FILES_FOLDER">
|
kind="IMPORTANT_FILES_FOLDER">
|
||||||
<itemPath>Makefile</itemPath>
|
<itemPath>Makefile</itemPath>
|
||||||
</logicalFolder>
|
</logicalFolder>
|
||||||
|
<logicalFolder name="TestFiles"
|
||||||
|
displayName="Test Files"
|
||||||
|
projectFiles="false"
|
||||||
|
kind="TEST_LOGICAL_FOLDER">
|
||||||
|
</logicalFolder>
|
||||||
|
<logicalFolder name="ExternalFiles"
|
||||||
|
displayName="Important Files"
|
||||||
|
projectFiles="false"
|
||||||
|
kind="IMPORTANT_FILES_FOLDER">
|
||||||
|
<itemPath>Makefile</itemPath>
|
||||||
|
</logicalFolder>
|
||||||
</logicalFolder>
|
</logicalFolder>
|
||||||
<projectmakefile>Makefile</projectmakefile>
|
<projectmakefile>Makefile</projectmakefile>
|
||||||
<confs>
|
<confs>
|
||||||
|
|||||||
@@ -13,8 +13,6 @@
|
|||||||
<gdb_interceptlist>
|
<gdb_interceptlist>
|
||||||
<gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
|
<gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
|
||||||
</gdb_interceptlist>
|
</gdb_interceptlist>
|
||||||
<gdb_signals>
|
|
||||||
</gdb_signals>
|
|
||||||
<gdb_options>
|
<gdb_options>
|
||||||
<DebugOptions>
|
<DebugOptions>
|
||||||
</DebugOptions>
|
</DebugOptions>
|
||||||
@@ -27,6 +25,7 @@
|
|||||||
<runprofile version="9">
|
<runprofile version="9">
|
||||||
<runcommandpicklist>
|
<runcommandpicklist>
|
||||||
<runcommandpicklistitem>"${OUTPUT_PATH}"</runcommandpicklistitem>
|
<runcommandpicklistitem>"${OUTPUT_PATH}"</runcommandpicklistitem>
|
||||||
|
<runcommandpicklistitem>"${OUTPUT_PATH}" --docroot ../../../ --https-address localhost --https-port 8080 --ssl-client-verification required --ssl-ca-certificates /home/user/tmp/ca.crt --ssl-certificate /home/user/tmp/cert.pem --ssl-private-key /home/user/tmp/cert.key --ssl-tmp-dh /home/user/tmp/dh.pem</runcommandpicklistitem>
|
||||||
<runcommandpicklistitem>"${OUTPUT_PATH}" --docroot . --https-address localhost --https-port 8080 --ssl-client-verification required --ssl-ca-certificates /home/user/tmp/ca.crt --ssl-certificate /home/user/tmp/cert.pem --ssl-private-key /home/user/tmp/cert.key --ssl-tmp-dh /home/user/tmp/dh.pem</runcommandpicklistitem>
|
<runcommandpicklistitem>"${OUTPUT_PATH}" --docroot . --https-address localhost --https-port 8080 --ssl-client-verification required --ssl-ca-certificates /home/user/tmp/ca.crt --ssl-certificate /home/user/tmp/cert.pem --ssl-private-key /home/user/tmp/cert.key --ssl-tmp-dh /home/user/tmp/dh.pem</runcommandpicklistitem>
|
||||||
</runcommandpicklist>
|
</runcommandpicklist>
|
||||||
<runcommand>"${OUTPUT_PATH}" --docroot . --https-address localhost --https-port 8080 --ssl-client-verification required --ssl-ca-certificates /home/user/tmp/ca.crt --ssl-certificate /home/user/tmp/cert.pem --ssl-private-key /home/user/tmp/cert.key --ssl-tmp-dh /home/user/tmp/dh.pem</runcommand>
|
<runcommand>"${OUTPUT_PATH}" --docroot . --https-address localhost --https-port 8080 --ssl-client-verification required --ssl-ca-certificates /home/user/tmp/ca.crt --ssl-certificate /home/user/tmp/cert.pem --ssl-private-key /home/user/tmp/cert.key --ssl-tmp-dh /home/user/tmp/dh.pem</runcommand>
|
||||||
|
|||||||
Reference in New Issue
Block a user