Skip to content

Commit

Permalink
qt branch: Soften font colours a bit to make them look more like master.
Browse files Browse the repository at this point in the history
  • Loading branch information
@perim
perim committed Feb 6, 2011
1 parent fccc40d commit 5ea9d75
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions data/base/palette.txt
View file
Expand Up @@ -19,7 +19,7 @@ a0,a0,ff,ff // text medium
60,60,ff,ff // text dark
1,1,1,ff // score box border
0,0,58,80 // score box
ff,ff,ff,ff // tooltip text
cf,cf,cf,ff // tooltip text
0,0,80,ff // unit select border
ff,ff,ff,10 // unit select box
0,1,61,0 // radar backgroudn
Expand Down Expand Up @@ -58,7 +58,7 @@ A0,70,00,ff // team2 - orange
90,00,70,ff // team7 - pink
00,80,80,ff // team8 - cyan
7f,7f,7f,ff // default form background
ff,ff,ff,ff // default form text
bf,bf,bf,ff // default form text
ff,ff,ff,ff // default form light
00,00,00,ff // default form dark
40,40,40,ff // default form hilite
Expand Down
2 changes: 1 addition & 1 deletion lib/framework/wzapp.cpp
View file
Expand Up @@ -209,7 +209,7 @@ WzMainWindow::WzMainWindow(const QGLFormat &format, QWidget *parent) : QGLWidget
regularFont.setPixelSize(12);
boldFont.setFamily("DejaVu Sans");
boldFont.setPixelSize(21);
boldFont.setBold(true);
boldFont.setWeight(QFont::DemiBold);
smallFont.setFamily("DejaVu Sans");
smallFont.setPixelSize(9);

Expand Down
22 changes: 11 additions & 11 deletions src/multiint.cpp
View file
Expand Up @@ -1046,7 +1046,7 @@ static void showPasswordLabel( WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset,
fy = yOffset + psWidget->y;

iV_SetFont(font_large);
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);

iV_DrawText(psLab->aText, fx, fy);
iV_SetTextColour(WZCOL_TEXT_MEDIUM);
Expand Down Expand Up @@ -3638,7 +3638,7 @@ void displayRemoteGame(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGH
}
else
{
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
}
iV_DrawText(_("Players"), x + 5, y + 18);
ssprintf(tmp, "%d/%d", NetPlay.games[i].desc.dwCurrentPlayers, NetPlay.games[i].desc.dwMaxPlayers);
Expand Down Expand Up @@ -3717,7 +3717,7 @@ void displayPosition(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT

drawBlueBox(x, y, psWidget->width, psWidget->height);
iV_SetFont(font_regular);
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
ssprintf(text, "Click to take player slot %d", NetPlay.players[i].position);
iV_DrawText(text, x + 10, y + 22);
}
Expand All @@ -3731,7 +3731,7 @@ static void displayAi(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT

drawBlueBox(x, y, psWidget->width, psWidget->height);
iV_SetFont(font_regular);
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
iV_DrawText((j >= 0) ? aidata[j].name : commsText[j + 2], x + 10, y + 22);
}

Expand All @@ -3756,7 +3756,7 @@ static void displayDifficulty(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset,
ASSERT_OR_RETURN(, j < ARRAY_SIZE(difficultyList), "Bad difficulty found: %d", j);
drawBlueBox(x, y, psWidget->width, psWidget->height);
iV_SetFont(font_regular);
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
iV_DrawImage(FrontImages, difficultyIcon(j), x + 5, y + 5);
iV_DrawText(difficultyList[j], x + 42, y + 22);
}
Expand All @@ -3780,15 +3780,15 @@ void displayPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *p

snprintf(mapProgressString, MAX_STR_LENGTH, _("Sending Map: %d%% "), progress);
iV_SetFont(font_regular); // font
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
iV_DrawText(mapProgressString, x + 15, y + 22);
}
else if (mapDownloadProgress != 100 && j == selectedPlayer)
{
static char mapProgressString[MAX_STR_LENGTH] = {'\0'};
snprintf(mapProgressString, MAX_STR_LENGTH, _("Map: %d%% downloaded"), mapDownloadProgress);
iV_SetFont(font_regular); // font
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
iV_DrawText(mapProgressString, x + 5, y + 22);
return;
}
Expand All @@ -3797,7 +3797,7 @@ void displayPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *p
drawBlueBox(x,y,psWidget->width,psWidget->height); // right

iV_SetFont(font_regular); // font
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);

// name
std::string name = NetPlay.players[j].name;
Expand All @@ -3816,7 +3816,7 @@ void displayPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *p
iV_SetTextColour(WZCOL_TEXT_MEDIUM);
iV_DrawText(_("HOST"), x + nameX, y + 28);
iV_SetFont(font_regular);
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
}
else if (NetPlay.bComms && NetPlay.isHost)
{
Expand All @@ -3829,7 +3829,7 @@ void displayPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *p
ssprintf(buf, "Ping: %03d", ingame.PingTimes[j]);
iV_DrawText(buf, x + nameX, y + 28);
iV_SetFont(font_regular);
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
}
else
{
Expand Down Expand Up @@ -3920,7 +3920,7 @@ void displayPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *p
iV_DrawImage(FrontImages, IMAGE_PLAYER_PC, x, y + 11);
}
iV_SetFont(font_regular);
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_SetTextColour(WZCOL_FORM_TEXT);
ASSERT_OR_RETURN(, NetPlay.players[j].ai < (int)aidata.size(), "Uh-oh, AI index out of bounds");
switch (NetPlay.players[j].ai)
{
Expand Down

0 comments on commit 5ea9d75

Please sign in to comment.